internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

docker_swarm_service: Allow passing period strings on relevant options (#52530)

Browse Source 
* Allow duration to be passed as duration strings

* Remove whitespace

* Add changelog fragment

* Fix broken test

* Better error handling
This commit is contained in:
Hannes Ljungberg
2019-02-21 12:47:06 +01:00
committed by John R Barker
parent 7276344f85
commit da8574c567
4 changed files with 83 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/integration/targets/docker_swarm_service/tasks/tests/options.yml
View File

@@ -2099,7 +2099,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
restart_policy_delay: 5
restart_policy_delay: 5000000000
register: restart_policy_delay_1
- name: restart_policy_delay (idempotency)
@@ -2107,7 +2107,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
restart_policy_delay: 5
restart_policy_delay: 5s
register: restart_policy_delay_2
- name: restart_policy_delay (change)
@@ -2115,7 +2115,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
restart_policy_delay: 10
restart_policy_delay: 10000000000
register: restart_policy_delay_3
- name: cleanup
@@ -2139,7 +2139,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
restart_policy_window: 10
restart_policy_window: 10000000000
register: restart_policy_window_1
- name: restart_policy_window (idempotency)
@@ -2147,7 +2147,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
restart_policy_window: 10
restart_policy_window: 10s
register: restart_policy_window_2
- name: restart_policy_window (change)
@@ -2155,7 +2155,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
restart_policy_window: 20
restart_policy_window: 20s
register: restart_policy_window_3
- name: cleanup
@@ -2301,7 +2301,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
update_delay: 5
update_delay: 5000000000
register: update_delay_1
- name: update_delay (idempotency)
@@ -2309,7 +2309,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
update_delay: 5
update_delay: 5s
register: update_delay_2
- name: update_delay (change)
@@ -2317,7 +2317,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
update_delay: 12
update_delay: 12000000000
register: update_delay_3
- name: cleanup
@@ -2429,7 +2429,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
update_monitor: 10000000000
update_monitor: 10s
register: update_monitor_2
- name: update_monitor (change)
@@ -2437,7 +2437,7 @@
name: "{{ service_name }}"
image: alpine:3.8
command: '/bin/sh -v -c "sleep 10m"'
update_monitor: 6000000000
update_monitor: 60s
register: update_monitor_3
- name: cleanup

14
test/units/modules/cloud/docker/test_docker_swarm_service.py
View File

@@ -98,3 +98,17 @@ def test_get_docker_environment(mocker, docker_swarm_service):
None, env_files=[]
)
assert result == []
def test_get_nanoseconds_from_raw_option(docker_swarm_service):
value = docker_swarm_service.get_nanoseconds_from_raw_option('test', None)
assert value is None
value = docker_swarm_service.get_nanoseconds_from_raw_option('test', '1m30s535ms')
assert value == 90535000000
value = docker_swarm_service.get_nanoseconds_from_raw_option('test', 10000000000)
assert value == 10000000000
with pytest.raises(ValueError):
docker_swarm_service.get_nanoseconds_from_raw_option('test', [])