docker modules: make sure everything works with older docker-py versions (#55258)

* General test improvements.

* Adjust tests to older docker-py versions.

* docker_swarm_server_info: work around problems with older docker-py versions

* Bump minimal docker-py version for options network_filters and disk_usage.

* More general test improvements.

* Correct usage of docker_image.

* Put files into output directory.

* Speed up test.

* Remove old check.
This commit is contained in:
Felix Fontein
2019-04-17 19:50:57 +02:00
committed by ansibot
parent 24b44e1772
commit 12d26eceb1
20 changed files with 119 additions and 40 deletions

View File

@@ -27,7 +27,6 @@
image: alpine:3.8
command: '/bin/sh -c "sleep 10m"'
state: started
auto_remove: yes
force_kill: yes
- name: Inspect a present container
@@ -45,12 +44,6 @@
- name: Dump docker inspect result
debug: var=docker_inspect_result
- name: Cleanup
docker_container:
name: "{{ cname }}"
state: absent
force_kill: yes
- assert:
that:
- result.exists
@@ -58,6 +51,13 @@
- "result.container"
- "result.container == docker_inspect_result[0]"
always:
- name: Cleanup
docker_container:
name: "{{ cname }}"
state: absent
force_kill: yes
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
- fail: msg="Too old docker / docker-py version to run docker_container_info tests!"