From 2291fa2d45ad38d6804e988e001761f4d8a29650 Mon Sep 17 00:00:00 2001 From: Aanand Prasad Date: Tue, 21 Apr 2015 11:58:44 +0100 Subject: [PATCH] Fix --timeout flag on restart, add tests for stop and restart Signed-off-by: Aanand Prasad --- compose/container.py | 4 ++-- tests/integration/cli_test.py | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/compose/container.py b/compose/container.py index 1d044a421c..e10f138503 100644 --- a/compose/container.py +++ b/compose/container.py @@ -126,8 +126,8 @@ class Container(object): def kill(self, **options): return self.client.kill(self.id, **options) - def restart(self): - return self.client.restart(self.id) + def restart(self, **options): + return self.client.restart(self.id, **options) def remove(self, **options): return self.client.remove_container(self.id, **options) diff --git a/tests/integration/cli_test.py b/tests/integration/cli_test.py index df3eec66d0..c7e2ea3438 100644 --- a/tests/integration/cli_test.py +++ b/tests/integration/cli_test.py @@ -332,6 +332,17 @@ class CLITestCase(DockerClientTestCase): self.command.dispatch(['rm', '-f'], None) self.assertEqual(len(service.containers(stopped=True)), 0) + def test_stop(self): + self.command.dispatch(['up', '-d'], None) + service = self.project.get_service('simple') + self.assertEqual(len(service.containers()), 1) + self.assertTrue(service.containers()[0].is_running) + + self.command.dispatch(['stop', '-t', '1'], None) + + self.assertEqual(len(service.containers(stopped=True)), 1) + self.assertFalse(service.containers(stopped=True)[0].is_running) + def test_kill(self): self.command.dispatch(['up', '-d'], None) service = self.project.get_service('simple') @@ -371,7 +382,7 @@ class CLITestCase(DockerClientTestCase): container = service.create_container() service.start_container(container) started_at = container.dictionary['State']['StartedAt'] - self.command.dispatch(['restart'], None) + self.command.dispatch(['restart', '-t', '1'], None) container.inspect() self.assertNotEqual( container.dictionary['State']['FinishedAt'],