kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-08 11:25:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix the unit tests for TestPrettyPrintOff

Browse Source 
A different failing test masked that this wasn't even being run.

Pointy Hat: sean- for testing first on Travis in a branch vs verifying locally
This commit is contained in:
Sean Chittenden
2016-05-11 15:46:08 -07:00
parent c612bb8276
commit 47146b9b87
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
command/agent/http.go
View File

@@ -175,8 +175,10 @@ func (s *HTTPServer) wrap(handler func(resp http.ResponseWriter, req *http.Reque
}
prettyPrint := false
if _, ok := req.URL.Query()["pretty"]; ok {
prettyPrint = true
if v, ok := req.URL.Query()["pretty"]; ok {
if len(v) > 0 && (len(v[0]) == 0 || v[0] != "0") {
prettyPrint = true
}
}
// Write out the JSON object

7
command/agent/http_test.go
View File

@@ -171,9 +171,12 @@ func testPrettyPrint(pretty string, prettyFmt bool, t *testing.T) {
req, _ := http.NewRequest("GET", urlStr, nil)
s.Server.wrap(handler)(resp, req)
expected, _ := json.MarshalIndent(r, "", " ")
var expected []byte
if prettyFmt {
expected, _ = json.MarshalIndent(r, "", " ")
expected = append(expected, "\n"...)
} else {
expected, _ = json.Marshal(r)
}
actual, err := ioutil.ReadAll(resp.Body)
if err != nil {
@@ -181,7 +184,7 @@ func testPrettyPrint(pretty string, prettyFmt bool, t *testing.T) {
}
if !bytes.Equal(expected, actual) {
t.Fatalf("bad: %q", string(actual))
t.Fatalf("bad:\nexpected:\t%q\nactual:\t\t%q", string(expected), string(actual))
}
}