kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #36490 from yongtang/03052018-expected-actual

Browse source 
Address `expected` vs `actual` in integration tests
This commit is contained in:
Yong Tang 2018-03-05 19:40:53 -08:00 • committed by GitHub
commit e02fa4a679
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration/container/inspect_test.go
View file

@ -40,9 +40,9 @@ func TestInspectCpusetInConfigPre120(t *testing.T) {
require.NoError(t, err, "unable to unmarshal body for version 1.19: %s", err) require.NoError(t, err, "unable to unmarshal body for version 1.19: %s", err)
config, ok := inspectJSON["Config"] config, ok := inspectJSON["Config"]
assert.Equal(t, ok, true, "Unable to find 'Config'") assert.Equal(t, true, ok, "Unable to find 'Config'")
cfg := config.(map[string]interface{}) cfg := config.(map[string]interface{})
_, ok = cfg["Cpuset"] _, ok = cfg["Cpuset"]
assert.Equal(t, ok, true, "API version 1.19 expected to include Cpuset in 'Config'") assert.Equal(t, true, ok, "API version 1.19 expected to include Cpuset in 'Config'")
} }

4
integration/container/kill_test.go
View file

@ -163,7 +163,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
inspect, err := client.ContainerInspect(ctx, cID) inspect, err := client.ContainerInspect(ctx, cID)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, inspect.State.OOMKilled, true) assert.Equal(t, true, inspect.State.OOMKilled)
} }
func TestInspectOomKilledFalse(t *testing.T) { func TestInspectOomKilledFalse(t *testing.T) {
@ -179,5 +179,5 @@ func TestInspectOomKilledFalse(t *testing.T) {
inspect, err := client.ContainerInspect(ctx, cID) inspect, err := client.ContainerInspect(ctx, cID)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, inspect.State.OOMKilled, false) assert.Equal(t, false, inspect.State.OOMKilled)
} }

6
integration/container/pause_test.go
View file

@ -35,7 +35,7 @@ func TestPause(t *testing.T) {
inspect, err := client.ContainerInspect(ctx, cID) inspect, err := client.ContainerInspect(ctx, cID)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, inspect.State.Paused, true) assert.Equal(t, true, inspect.State.Paused)
err = client.ContainerUnpause(ctx, cID) err = client.ContainerUnpause(ctx, cID)
require.NoError(t, err) require.NoError(t, err)
@ -47,7 +47,7 @@ func TestPause(t *testing.T) {
Until: until, Until: until,
Filters: filters.NewArgs(filters.Arg("container", cID)), Filters: filters.NewArgs(filters.Arg("container", cID)),
}) })
assert.Equal(t, getEventActions(t, messages, errs), []string{"pause", "unpause"}) assert.Equal(t, []string{"pause", "unpause"}, getEventActions(t, messages, errs))
} }
func TestPauseFailsOnWindowsServerContainers(t *testing.T) { func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
@ -88,7 +88,7 @@ func getEventActions(t *testing.T, messages <-chan events.Message, errs <-chan e
for { for {
select { select {
case err := <-errs: case err := <-errs:
assert.Equal(t, err == nil || err == io.EOF, true) assert.True(t, err == nil || err == io.EOF)
return actions return actions
case e := <-messages: case e := <-messages:
actions = append(actions, e.Status) actions = append(actions, e.Status)

4
integration/container/remove_test.go
View file

@ -66,7 +66,7 @@ func TestRemoveContainerWithVolume(t *testing.T) {
insp, _, err := client.ContainerInspectWithRaw(ctx, cID, true) insp, _, err := client.ContainerInspectWithRaw(ctx, cID, true)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, len(insp.Mounts), 1) assert.Equal(t, 1, len(insp.Mounts))
volName := insp.Mounts[0].Name volName := insp.Mounts[0].Name
err = client.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{ err = client.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{
@ -76,7 +76,7 @@ func TestRemoveContainerWithVolume(t *testing.T) {
volumes, err := client.VolumeList(ctx, filters.NewArgs(filters.Arg("name", volName))) volumes, err := client.VolumeList(ctx, filters.NewArgs(filters.Arg("name", volName)))
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, len(volumes.Volumes), 0) assert.Equal(t, 0, len(volumes.Volumes))
} }
func TestRemoveContainerRunning(t *testing.T) { func TestRemoveContainerRunning(t *testing.T) {

2
integration/container/resize_test.go
View file

@ -44,7 +44,7 @@ func TestResizeWithInvalidSize(t *testing.T) {
endpoint := "/containers/" + cID + "/resize?h=foo&w=bar" endpoint := "/containers/" + cID + "/resize?h=foo&w=bar"
res, _, err := req.Post(endpoint) res, _, err := req.Post(endpoint)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, res.StatusCode, http.StatusBadRequest) assert.Equal(t, http.StatusBadRequest, res.StatusCode)
} }
func TestResizeWhenContainerNotStarted(t *testing.T) { func TestResizeWhenContainerNotStarted(t *testing.T) {