1. docker
  2. Commit 8a854e933b3dbb26cfce28b920cff61909412c6f
Browse code

Address `expected` vs `actual` in integration tests

This fix addresses `expected` vs `actual` in integration tests
so that they match `assert.Equal(t, expected, actual)`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

Yong Tang authored on 2018/03/06 01:51:46
Showing 5 changed files
integration/container/inspect_test.go
History View file @ 8a854e9
... ... 
@@ -40,9 +40,9 @@ func TestInspectCpusetInConfigPre120(t *testing.T) {
40 40 
 	require.NoError(t, err, "unable to unmarshal body for version 1.19: %s", err)
41 41
42 42 
 	config, ok := inspectJSON["Config"]
43 
-	assert.Equal(t, ok, true, "Unable to find 'Config'")
43 
+	assert.Equal(t, true, ok, "Unable to find 'Config'")
44 44
45 45 
 	cfg := config.(map[string]interface{})
46 46 
 	_, ok = cfg["Cpuset"]
47 
-	assert.Equal(t, ok, true, "API version 1.19 expected to include Cpuset in 'Config'")
47 
+	assert.Equal(t, true, ok, "API version 1.19 expected to include Cpuset in 'Config'")
48 48 
 }
integration/container/kill_test.go
History View file @ 8a854e9
... ... 
@@ -163,7 +163,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
163 163
164 164 
 	inspect, err := client.ContainerInspect(ctx, cID)
165 165 
 	require.NoError(t, err)
166 
-	assert.Equal(t, inspect.State.OOMKilled, true)
166 
+	assert.Equal(t, true, inspect.State.OOMKilled)
167 167 
 }
168 168
169 169 
 func TestInspectOomKilledFalse(t *testing.T) {
... ... 
@@ -179,5 +179,5 @@ func TestInspectOomKilledFalse(t *testing.T) {
179 179
180 180 
 	inspect, err := client.ContainerInspect(ctx, cID)
181 181 
 	require.NoError(t, err)
182 
-	assert.Equal(t, inspect.State.OOMKilled, false)
182 
+	assert.Equal(t, false, inspect.State.OOMKilled)
183 183 
 }
integration/container/pause_test.go
History View file @ 8a854e9
... ... 
@@ -35,7 +35,7 @@ func TestPause(t *testing.T) {
35 35
36 36 
 	inspect, err := client.ContainerInspect(ctx, cID)
37 37 
 	require.NoError(t, err)
38 
-	assert.Equal(t, inspect.State.Paused, true)
38 
+	assert.Equal(t, true, inspect.State.Paused)
39 39
40 40 
 	err = client.ContainerUnpause(ctx, cID)
41 41 
 	require.NoError(t, err)
... ... 
@@ -47,7 +47,7 @@ func TestPause(t *testing.T) {
47 47 
 		Until:   until,
48 48 
 		Filters: filters.NewArgs(filters.Arg("container", cID)),
49 49 
 	})
50 
-	assert.Equal(t, getEventActions(t, messages, errs), []string{"pause", "unpause"})
50 
+	assert.Equal(t, []string{"pause", "unpause"}, getEventActions(t, messages, errs))
51 51 
 }
52 52
53 53 
 func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
... ... 
@@ -88,7 +88,7 @@ func getEventActions(t *testing.T, messages <-chan events.Message, errs <-chan e
88 88 
 	for {
89 89 
 		select {
90 90 
 		case err := <-errs:
91 
-			assert.Equal(t, err == nil || err == io.EOF, true)
91 
+			assert.True(t, err == nil || err == io.EOF)
92 92 
 			return actions
93 93 
 		case e := <-messages:
94 94 
 			actions = append(actions, e.Status)
integration/container/remove_test.go
History View file @ 8a854e9
... ... 
@@ -66,7 +66,7 @@ func TestRemoveContainerWithVolume(t *testing.T) {
66 66
67 67 
 	insp, _, err := client.ContainerInspectWithRaw(ctx, cID, true)
68 68 
 	require.NoError(t, err)
69 
-	assert.Equal(t, len(insp.Mounts), 1)
69 
+	assert.Equal(t, 1, len(insp.Mounts))
70 70 
 	volName := insp.Mounts[0].Name
71 71
72 72 
 	err = client.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{
... ... 
@@ -76,7 +76,7 @@ func TestRemoveContainerWithVolume(t *testing.T) {
76 76
77 77 
 	volumes, err := client.VolumeList(ctx, filters.NewArgs(filters.Arg("name", volName)))
78 78 
 	require.NoError(t, err)
79 
-	assert.Equal(t, len(volumes.Volumes), 0)
79 
+	assert.Equal(t, 0, len(volumes.Volumes))
80 80 
 }
81 81
82 82 
 func TestRemoveContainerRunning(t *testing.T) {
integration/container/resize_test.go
History View file @ 8a854e9
... ... 
@@ -44,7 +44,7 @@ func TestResizeWithInvalidSize(t *testing.T) {
44 44 
 	endpoint := "/containers/" + cID + "/resize?h=foo&w=bar"
45 45 
 	res, _, err := req.Post(endpoint)
46 46 
 	require.NoError(t, err)
47 
-	assert.Equal(t, res.StatusCode, http.StatusBadRequest)
47 
+	assert.Equal(t, http.StatusBadRequest, res.StatusCode)
48 48 
 }
49 49
50 50 
 func TestResizeWhenContainerNotStarted(t *testing.T) {