jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure we always have the latest busybox image, so that build --pull tests don't flake.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-11-20 17:51:36 -05:00
commit 2351e11cc8
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/acceptance/cli_test.py
View file

@ -15,6 +15,7 @@ from compose.cli.command import get_project
from compose.cli.docker_client import docker_client
from compose.container import Container
from tests.integration.testcases import DockerClientTestCase
from tests.integration.testcases import pull_busybox
ProcessResult = namedtuple('ProcessResult', 'stdout stderr')
@ -184,6 +185,8 @@ class CLITestCase(DockerClientTestCase):
assert BUILD_PULL_TEXT not in result.stdout
def test_build_pull(self):
# Make sure we have the latest busybox already
pull_busybox(self.client)
self.base_dir = 'tests/fixtures/simple-dockerfile'
self.dispatch(['build', 'simple'], None)
@ -192,6 +195,8 @@ class CLITestCase(DockerClientTestCase):
assert BUILD_PULL_TEXT in result.stdout
def test_build_no_cache_pull(self):
# Make sure we have the latest busybox already
pull_busybox(self.client)
self.base_dir = 'tests/fixtures/simple-dockerfile'
self.dispatch(['build', 'simple'])