Fix docker integration tests (#1226)

Caused by a major upgrade of the docker-py client. Fix tests and pin
the client in the image.

Also, fix an unrelated flaky test.

Author: olivielpeau

.circleci/images/builder/Dockerfile

@@ -72,7 +72,7 @@ RUN gem install bundler --version "$BUNDLER_VERSION"
 
 RUN apt-get update && apt-get install -y python-pip  \
 	&& pip install invoke \
-	&& pip install docker \
+	&& pip install docker==3.0.1 \
 	&& pip install reno   \
 	&& pip install requests
 

pkg/util/kubernetes/kubelet/podwatcher_test.go

@@ -198,10 +198,14 @@ func (suite *PodwatcherTestSuite) TestPodWatcherExpireWholePod() {
 	// That one should expire, we'll have 8 entities left
 	expire, err = watcher.Expire()
 	require.Nil(suite.T(), err)
-	require.EqualValues(suite.T(), expire, []string{
+	expectedExpire := []string{
 		"kubernetes_pod://d91aa43c-0769-11e8-afcc-000c29dea4f6",
 		"docker://3e13513f94b41d23429804243820438fb9a214238bf2d4f384741a48b575670a",
-	})
+	}
+	require.Equal(suite.T(), len(expectedExpire), len(expire))
+	for _, expectedEntity := range expectedExpire {
+		assert.Contains(suite.T(), expire, expectedEntity)
+	}
 	require.Len(suite.T(), watcher.lastSeen, 8)
 }
 

tasks/docker.py

@@ -59,7 +59,7 @@ def dockerize_test(ctx, binary, skip_cleanup=False):
             ctx.run("cp -R testdata %s" % temp_folder)
             stream.write("COPY testdata /testdata")
 
-    test_image = client.images.build(path=temp_folder, rm=True)
+    test_image, _ = client.images.build(path=temp_folder, rm=True)
 
     scratch_volume = client.volumes.create()
 
@@ -76,7 +76,7 @@ def dockerize_test(ctx, binary, skip_cleanup=False):
                  '/sys/fs/cgroup': {'bind': '/host/sys/fs/cgroup', 'mode': 'ro'},
                  scratch_volume.name: {'bind': '/tmp/scratch', 'mode': 'rw'}})
 
-    exit_code = test_container.wait()
+    exit_code = test_container.wait()['StatusCode']
 
     print(test_container.logs(
         stdout=True,

test/integration/docker/dsd_listening.py

@@ -53,19 +53,19 @@ def tearDownModule():
 
 def waitUntilListening(container, retries=20):
     for x in range(0, retries):
-        out = container.exec_run(cmd="netstat -a")
+        out = container.exec_run(cmd="netstat -a").output
         if ":8125" in out or SOCKET_PATH in out:
             return True
     return False
 
 
 def isUDPListening(container):
-    out = container.exec_run(cmd="netstat -a")
+    out = container.exec_run(cmd="netstat -a").output
     return ":8125" in out
 
 
 def isUDSListening(container, retries=10):
-    out = container.exec_run(cmd="netstat -a")
+    out = container.exec_run(cmd="netstat -a").output
     return SOCKET_PATH in out
 
 
@@ -74,17 +74,17 @@ def setUp(self):
         self.assertIsNotNone(os.environ.get('DOCKER_IMAGE'), "DOCKER_IMAGE envvar needed")
 
     def test_udp(self):
-        waitUntilListening(containers["udp"])
+        self.assertTrue(waitUntilListening(containers["udp"]))
         self.assertTrue(isUDPListening(containers["udp"]))
         self.assertFalse(isUDSListening(containers["udp"]))
 
     def test_uds(self):
-        waitUntilListening(containers["uds"])
+        self.assertTrue(waitUntilListening(containers["uds"]))
         self.assertFalse(isUDPListening(containers["uds"]))
         self.assertTrue(isUDSListening(containers["uds"]))
 
     def test_both(self):
-        waitUntilListening(containers["both"])
+        self.assertTrue(waitUntilListening(containers["both"]))
         self.assertTrue(isUDPListening(containers["both"]))
         self.assertTrue(isUDSListening(containers["both"]))