serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-05 18:44:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1734 from tw4452852/ineffassign

Browse source 
markdown: fix the real ineffectual assignments in test
This commit is contained in:
Matt Holt 2017-06-29 08:28:57 -06:00 committed by GitHub
commit 4750699ab0
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
caddyhttp/markdown/markdown_test.go
View file

@ -81,17 +81,14 @@ func TestMarkdown(t *testing.T) {
req, err := http.NewRequest("GET", url, nil) req, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
t.Fatalf("Could not create HTTP request: %v", err) t.Fatalf("Could not create HTTP request: %v", err)
return ""
} }
rec := httptest.NewRecorder() rec := httptest.NewRecorder()
code, err := md.ServeHTTP(rec, req) code, err := md.ServeHTTP(rec, req)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
return ""
} }
if code != http.StatusOK { if code != http.StatusOK {
t.Fatalf("Wrong status, expected: %d and got %d", http.StatusOK, code) t.Fatalf("Wrong status, expected: %d and got %d", http.StatusOK, code)
return ""
} }
return rec.Body.String() return rec.Body.String()
} }
@ -117,6 +114,10 @@ Welcome to A Caddy website!
</body> </body>
</html> </html>
` `
if respBody != expectedBody {
t.Fatalf("Expected body:\n%q\ngot:\n%q", expectedBody, respBody)
}
respBody = get("/docflags/test.md") respBody = get("/docflags/test.md")
expectedBody = `Doc.var_string hello expectedBody = `Doc.var_string hello
Doc.var_bool true Doc.var_bool true
@ -226,11 +227,9 @@ func TestTemplateReload(t *testing.T) {
code, err := md.ServeHTTP(rec, req) code, err := md.ServeHTTP(rec, req)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
return ""
} }
if code != http.StatusOK { if code != http.StatusOK {
t.Fatalf("Wrong status, expected: %d and got %d", http.StatusOK, code) t.Fatalf("Wrong status, expected: %d and got %d", http.StatusOK, code)
return ""
} }
return rec.Body.String() return rec.Body.String()
} }