diff options
| author | Felix Fontein <felix@fontein.de> | 2019-03-05 17:09:00 +0100 |
|---|---|---|
| committer | John R Barker <john@johnrbarker.com> | 2019-03-05 16:09:00 +0000 |
| commit | 8c628c9b2c0fc86a60307ed98d8429509a72d816 (patch) | |
| tree | 53267f3653210be9e7b55d94b669e11cc1c80642 /test/integration/targets/docker_container | |
| parent | 15104355779fec18571740cd7189267d8eb2e85e (diff) | |
| download | ansible-8c628c9b2c0fc86a60307ed98d8429509a72d816.tar.gz | |
Simplify docker_*_facts return names (#51939)
* Simplify docker_*_facts return names.
* Adjust regular return values of modules to match style of docker_*_facts modules.
Diffstat (limited to 'test/integration/targets/docker_container')
| -rw-r--r-- | test/integration/targets/docker_container/tasks/tests/options.yml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/integration/targets/docker_container/tasks/tests/options.yml b/test/integration/targets/docker_container/tasks/tests/options.yml index 90ffd3136e..c6ab691c02 100644 --- a/test/integration/targets/docker_container/tasks/tests/options.yml +++ b/test/integration/targets/docker_container/tasks/tests/options.yml @@ -543,15 +543,15 @@ # of hello-world. We don't know why this happens, but it happens # often enough to be annoying. That's why we disable this for now, # and simply test that 'Output' is contained in the result. - - "'Output' in detach_no_cleanup.docker_container" - # - "'Hello from Docker!' in detach_no_cleanup.docker_container.Output" + - "'Output' in detach_no_cleanup.container" + # - "'Hello from Docker!' in detach_no_cleanup.container.Output" - detach_no_cleanup_cleanup is changed - - "'Output' in detach_cleanup.docker_container" - # - "'Hello from Docker!' in detach_cleanup.docker_container.Output" + - "'Output' in detach_cleanup.container" + # - "'Hello from Docker!' in detach_cleanup.container.Output" - detach_cleanup_cleanup is not changed - assert: that: - - "'Cannot retrieve result as auto_remove is enabled' == detach_auto_remove.docker_container.Output" + - "'Cannot retrieve result as auto_remove is enabled' == detach_auto_remove.container.Output" - detach_auto_remove_cleanup is not changed when: docker_py_version is version('2.1.0', '>=') @@ -2378,7 +2378,7 @@ - memory_swap_1 is changed # Sometimes (in particular during integration tests, maybe when not running # on a proper VM), memory_swap cannot be set and will be -1 afterwards. - - memory_swap_2 is not changed or memory_swap_2.docker_container.HostConfig.MemorySwap == -1 + - memory_swap_2 is not changed or memory_swap_2.container.HostConfig.MemorySwap == -1 - memory_swap_3 is changed - debug: var=memory_swap_1 @@ -2780,7 +2780,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - pid_mode: "container:{{ pid_mode_helper.docker_container.Id }}" + pid_mode: "container:{{ pid_mode_helper.container.Id }}" register: pid_mode_1 ignore_errors: yes # docker-py < 2.0 does not support "arbitrary" pid_mode values @@ -3103,9 +3103,9 @@ - recreate_2 is changed - recreate_3 is changed - recreate_4 is changed - - recreate_1.docker_container.Id != recreate_2.docker_container.Id - - recreate_2.docker_container.Id == recreate_3.docker_container.Id - - recreate_3.docker_container.Id != recreate_4.docker_container.Id + - recreate_1.container.Id != recreate_2.container.Id + - recreate_2.container.Id == recreate_3.container.Id + - recreate_3.container.Id != recreate_4.container.Id #################################################################### ## restart ######################################################### @@ -3144,7 +3144,7 @@ that: - restart_1 is changed - restart_2 is changed - - restart_1.docker_container.Id == restart_2.docker_container.Id + - restart_1.container.Id == restart_2.container.Id #################################################################### ## restart_policy ################################################## |