cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve paused test and behavior. (#48056)

Browse source
This commit is contained in:
Felix Fontein 2018-11-05 12:34:23 +01:00 committed by John R Barker
parent af2b477950
commit 569ec812e7
2 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/ansible/modules/cloud/docker/docker_container.py
View file

@ -2248,6 +2248,7 @@ class ContainerManager(DockerBaseClass):
self.fail("Error %s container %s: %s" % ( self.fail("Error %s container %s: %s" % (
"pausing" if self.parameters.paused else "unpausing", container.Id, str(exc) "pausing" if self.parameters.paused else "unpausing", container.Id, str(exc)
)) ))
container = self._get_container(container.Id)
self.results['changed'] = True self.results['changed'] = True
self.results['actions'].append(dict(set_paused=self.parameters.paused)) self.results['actions'].append(dict(set_paused=self.parameters.paused))

28
test/integration/targets/docker_container/tasks/tests/options.yml
View file

@ -2609,24 +2609,21 @@
- name: paused - name: paused
docker_container: docker_container:
image: alpine:3.8 image: alpine:3.8
command: "/bin/sh -c 'sleep 1s ; yes'" command: "/bin/sh -c 'sleep 10m'"
name: "{{ cname }}" name: "{{ cname }}"
state: started state: started
paused: yes paused: yes
stop_timeout: 1 stop_timeout: 1
register: paused_1 register: paused_1
- pause: - name: inspect paused
seconds: 2 command: "docker inspect -f {% raw %}'{{.State.Status}} {{.State.Paused}}'{% endraw %} {{ cname }}"
- name: paused (logs)
command: docker logs --tail=20 "{{ cname }}"
register: paused_2 register: paused_2
- name: paused (idempotent) - name: paused (idempotent)
docker_container: docker_container:
image: alpine:3.8 image: alpine:3.8
command: "/bin/sh -c 'sleep 1s ; yes'" command: "/bin/sh -c 'sleep 10m'"
name: "{{ cname }}" name: "{{ cname }}"
state: started state: started
paused: yes paused: yes
@ -2643,17 +2640,8 @@
stop_timeout: 1 stop_timeout: 1
register: paused_4 register: paused_4
- pause: - name: inspect paused
seconds: 2 command: "docker inspect -f {% raw %}'{{.State.Status}} {{.State.Paused}}'{% endraw %} {{ cname }}"
- name: paused (stop)
docker_container:
name: "{{ cname }}"
state: stopped
stop_timeout: 1
- name: paused (logs)
command: docker logs --tail=20 "{{ cname }}"
register: paused_5 register: paused_5
- name: cleanup - name: cleanup
@ -2665,10 +2653,10 @@
- assert: - assert:
that: that:
- paused_1 is changed - paused_1 is changed
- paused_2.stdout_lines | length == 0 - 'paused_2.stdout == "paused true"'
- paused_3 is not changed - paused_3 is not changed
- paused_4 is changed - paused_4 is changed
- paused_5.stdout_lines | length > 0 - 'paused_5.stdout == "running false"'
#################################################################### ####################################################################
## pid_mode ######################################################## ## pid_mode ########################################################