Browse Source

Miscellaneous test fixes

Signed-off-by: Joffrey F <[email protected]>
Joffrey F 8 years ago
parent
commit
819be19f7c
2 changed files with 8 additions and 2 deletions
  1. 7 1
      tests/acceptance/cli_test.py
  2. 1 1
      tests/integration/service_test.py

+ 7 - 1
tests/acceptance/cli_test.py

@@ -853,7 +853,13 @@ class CLITestCase(DockerClientTestCase):
         volumes = self.project.volumes.volumes
         assert 'data' in volumes
         volume = volumes['data']
-        assert volume.exists()
+
+        # The code below is a Swarm-compatible equivalent to volume.exists()
+        remote_volumes = [
+            v for v in self.client.volumes().get('Volumes', [])
+            if v['Name'].split('/')[-1] == volume.full_name
+        ]
+        assert len(remote_volumes) > 0
 
     @v2_only()
     def test_up_no_ansi(self):

+ 1 - 1
tests/integration/service_test.py

@@ -793,7 +793,7 @@ class ServiceTest(DockerClientTestCase):
 
         net_container = self.client.create_container(
             'busybox', 'top', host_config=self.client.create_host_config(
-                extra_hosts={'google.local': '8.8.8.8'}
+                extra_hosts={'google.local': '127.0.0.1'}
             ), name='composetest_build_network'
         )