0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #38568 from thaJeztah/fix_ping_test

Browse source 
Fix ping-tests using wrong status-code
This commit is contained in:
Yong Tang 2019-01-14 21:01:34 -08:00 • committed by GitHub
commit 834801a4e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/ping_test.go
View file

@ -32,13 +32,13 @@ func TestPingFail(t *testing.T) {
}
ping, err := client.Ping(context.Background())
assert.Check(t, is.ErrorContains(err, ""))
assert.ErrorContains(t, err, "some error with the server")
assert.Check(t, is.Equal(false, ping.Experimental))
assert.Check(t, is.Equal("", ping.APIVersion))
withHeader = true
ping2, err := client.Ping(context.Background())
assert.Check(t, is.ErrorContains(err, ""))
assert.ErrorContains(t, err, "some error with the server")
assert.Check(t, is.Equal(true, ping2.Experimental))
assert.Check(t, is.Equal("awesome", ping2.APIVersion))
}
@ -58,7 +58,7 @@ func TestPingWithError(t *testing.T) {
}
ping, err := client.Ping(context.Background())
assert.Check(t, is.ErrorContains(err, ""))
assert.ErrorContains(t, err, "some error")
assert.Check(t, is.Equal(false, ping.Experimental))
assert.Check(t, is.Equal("", ping.APIVersion))
}
@ -68,16 +68,16 @@ func TestPingWithError(t *testing.T) {
func TestPingSuccess(t *testing.T) {
client := &Client{
client: newMockClient(func(req *http.Request) (*http.Response, error) {
resp := &http.Response{StatusCode: http.StatusInternalServerError}
resp := &http.Response{StatusCode: http.StatusOK}
resp.Header = http.Header{}
resp.Header.Set("API-Version", "awesome")
resp.Header.Set("Docker-Experimental", "true")
resp.Body = ioutil.NopCloser(strings.NewReader("some error with the server"))
resp.Body = ioutil.NopCloser(strings.NewReader("OK"))
return resp, nil
}),
}
ping, err := client.Ping(context.Background())
assert.Check(t, is.ErrorContains(err, ""))
assert.NilError(t, err)
assert.Check(t, is.Equal(true, ping.Experimental))
assert.Check(t, is.Equal("awesome", ping.APIVersion))
}