openstack
/
fuel-octane
Code Issues Proposed changes

Merge "If dockerctl don't stop container stop it using docker"

This commit is contained in:
Jenkins 2016-05-30 14:14:42 +00:00 committed by Gerrit Code Review
parent 258d16b0f3 d0250fe95e
commit a4e85d1f54
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
octane/tests/test_docker.py
View File

@ -91,3 +91,29 @@ def test_wait_for_puppet_in_container(mocker, mock_subprocess):
]
docker._wait_for_puppet_in_container(test_container, attempts, delay)
assert 2 == mock_subprocess.call_count
@pytest.mark.parametrize(
"container_id,stop_by_docker",
[('\n', False), ("123", True), ("123\n", True)])
@pytest.mark.parametrize("container_name", ["container_name"])
def test_docker_stop(
mocker, mock_subprocess, container_id, container_name, stop_by_docker):
mock_subprocess_call_output = mocker.patch(
"octane.util.subprocess.call_output", return_value=container_id)
mock_stop_action = mocker.patch("octane.util.docker._container_action")
docker.stop_container(container_name)
mock_stop_action.assert_called_once_with(container_name, "stop")
mock_subprocess_call_output.assert_called_once_with([
'docker',
'ps',
'--filter',
'name={0}'.format(container_name),
'--format',
'{{.ID}}'
])
if stop_by_docker:
mock_subprocess.assert_called_once_with(
["docker", "stop", container_id.strip()])
else:
assert not mock_subprocess.called

10
octane/util/docker.py
View File

@ -210,6 +210,16 @@ def _container_action(container, action):
def stop_container(container):
_container_action(container, "stop")
container_id = subprocess.call_output([
'docker',
'ps',
'--filter',
'name={0}'.format(container),
'--format',
'{{.ID}}'
]).strip()
if container_id:
subprocess.call(["docker", "stop", container_id])
def start_container(container):