Merge pull request #757 from docker/756-containerized-integration

Containerized Integration

Author: shin-

.dockerignore

@@ -14,3 +14,4 @@ tests/__pycache__
 
 # Compiled Documentation
 site/
+Makefile

Makefile

@@ -4,6 +4,9 @@ HOST_TMPDIR=test -n "$(TMPDIR)" && echo $(TMPDIR) || echo /tmp
 
 all: test
 
+clean:
+	docker rm -vf dpy-dind
+
 build:
 	docker build -t docker-py .
 
@@ -23,3 +26,10 @@ integration-test: build
 
 integration-test-py3: build-py3
 	docker run -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test -rxs tests/integration_test.py
+
+integration-dind: build build-py3
+	docker build -t dpy-tests -f ./tests/Dockerfile .
+	docker run -d --name dpy-dind -v /tmp --privileged dockerswarm/dind:1.8.1 docker -d -H tcp://0.0.0.0:2375
+	docker run --volumes-from dpy-dind --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py py.test -rxs tests/integration_test.py
+	docker run --volumes-from dpy-dind --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3 py.test -rxs tests/integration_test.py
+	docker rm -vf dpy-dind

tests/integration_test.py

@@ -190,7 +190,6 @@ def runTest(self):
 
 
 class TestCreateContainerWithBinds(BaseTestCase):
-    @pytest.mark.skipif(True, reason="Doesn't work inside a container - FIXME")
     def runTest(self):
         mount_dest = '/mnt'
         mount_origin = tempfile.mkdtemp()
@@ -233,7 +232,6 @@ def runTest(self):
 
 
 class TestCreateContainerWithRoBinds(BaseTestCase):
-    @pytest.mark.skipif(True, reason="Doesn't work inside a container - FIXME")
     def runTest(self):
         mount_dest = '/mnt'
         mount_origin = tempfile.mkdtemp()
@@ -1461,8 +1459,11 @@ def runTest(self):
         self.client.wait(c)
         logs = self.client.logs(c)
 
+        if six.PY3:
+            logs = logs.decode('utf-8')
+
         self.assertEqual(
-            filter(None, logs.split('\n')),
+            list(filter(None, logs.split('\n'))),
             ['not-ignored'],
         )
 

tests/utils_test.py

@@ -234,14 +234,18 @@ def test_ulimit_invalid_type(self):
 
     def test_create_host_config_dict_logconfig(self):
         dct = {'type': LogConfig.types.SYSLOG, 'config': {'key1': 'val1'}}
-        config = create_host_config(log_config=dct)
+        config = create_host_config(
+            version=DEFAULT_DOCKER_API_VERSION, log_config=dct
+        )
         self.assertIn('LogConfig', config)
         self.assertTrue(isinstance(config['LogConfig'], LogConfig))
         self.assertEqual(dct['type'], config['LogConfig'].type)
 
     def test_create_host_config_obj_logconfig(self):
         obj = LogConfig(type=LogConfig.types.SYSLOG, config={'key1': 'val1'})
-        config = create_host_config(log_config=obj)
+        config = create_host_config(
+            version=DEFAULT_DOCKER_API_VERSION, log_config=obj
+        )
         self.assertIn('LogConfig', config)
         self.assertTrue(isinstance(config['LogConfig'], LogConfig))
         self.assertEqual(obj, config['LogConfig'])