Skip to content

Commit

Permalink
Miscellaneous test fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Joffrey F <joffrey@docker.com>
  • Loading branch information
shin- committed Nov 1, 2017
1 parent 6078736 commit 9f80ec5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion tests/acceptance/cli_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,13 @@ def test_up_no_start(self):
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):
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/service_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ def test_build_with_network(self):

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'
)

Expand Down

0 comments on commit 9f80ec5

Please sign in to comment.