From e174c3fd1c10222183afc5822e47aeca4e1c466c Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Thu, 11 Jan 2018 12:24:38 -0800 Subject: Revert -d/--timeout exclusion Signed-off-by: Joffrey F --- tests/acceptance/cli_test.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/acceptance/cli_test.py') diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py index cb583b34..fa051fec 100644 --- a/tests/acceptance/cli_test.py +++ b/tests/acceptance/cli_test.py @@ -1361,9 +1361,12 @@ class CLITestCase(DockerClientTestCase): ['up', '-d', '--force-recreate', '--no-recreate'], returncode=1) - def test_up_with_timeout_detached(self): - result = self.dispatch(['up', '-d', '-t', '1'], returncode=1) - assert "-d and --timeout cannot be combined." in result.stderr + def test_up_with_timeout(self): + self.dispatch(['up', '-d', '-t', '1']) + service = self.project.get_service('simple') + another = self.project.get_service('another') + assert len(service.containers()) == 1 + assert len(another.containers()) == 1 @mock.patch.dict(os.environ) def test_up_with_ignore_remove_orphans(self): -- cgit v1.2.3