diff --git a/paunch/runner.py b/paunch/runner.py index 2943766..26081ba 100644 --- a/paunch/runner.py +++ b/paunch/runner.py @@ -96,7 +96,7 @@ class DockerRunner(object): self.remove_container(container) def remove_container(self, container): - cmd = [self.docker_cmd, 'rm', '-f', container] + cmd = [self.docker_cmd, 'rm', container] cmd_stdout, cmd_stderr, returncode = self.execute(cmd) if returncode != 0: LOG.error('Error removing container: %s' % container) diff --git a/paunch/tests/test_builder_compose1.py b/paunch/tests/test_builder_compose1.py index f57765c..c5dc401 100644 --- a/paunch/tests/test_builder_compose1.py +++ b/paunch/tests/test_builder_compose1.py @@ -283,13 +283,13 @@ three-12345678 three''', '', 0), '--format', '{{.Names}} {{.Label "container_name"}}'] ), # rm containers not in config - mock.call(['docker', 'rm', '-f', 'five']), - mock.call(['docker', 'rm', '-f', 'six']), + mock.call(['docker', 'rm', 'five']), + mock.call(['docker', 'rm', 'six']), # rm two, changed config mock.call(['docker', 'inspect', '--type', 'container', '--format', '{{index .Config.Labels "config_data"}}', 'two-12345678']), - mock.call(['docker', 'rm', '-f', 'two-12345678']), + mock.call(['docker', 'rm', 'two-12345678']), # check three, config hasn't changed mock.call(['docker', 'inspect', '--type', 'container', '--format', '{{index .Config.Labels "config_data"}}', diff --git a/paunch/tests/test_runner.py b/paunch/tests/test_runner.py index a54d85e..c1dadaa 100644 --- a/paunch/tests/test_runner.py +++ b/paunch/tests/test_runner.py @@ -95,7 +95,7 @@ class TestDockerRunner(base.TestCase): self.runner.remove_container('one') self.assert_execute( - popen, ['docker', 'rm', '-f', 'one'] + popen, ['docker', 'rm', 'one'] ) @mock.patch('subprocess.Popen')