Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docker_network: adding/updating tests #47775

Merged
merged 2 commits into from
Oct 29, 2018
Merged

docker_network: adding/updating tests #47775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2767d90
Add substring test (fixes #32927).
felixfontein Oct 29, 2018
f922c36
Extend idempotency tests (fixes #32580).
felixfontein Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 24 additions & 6 deletions test/integration/targets/docker_network/tasks/tests/basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,30 @@
state: present
register: networks_1

- name: Connect network to containers 1
docker_network:
name: "{{ nname_1 }}"
state: present
connected:
- "{{ cname_1 }}"
register: networks_2

- name: Connect network to containers 1 (idempotency)
docker_network:
name: "{{ nname_1 }}"
state: present
connected:
- "{{ cname_1 }}"
register: networks_2_idem

- name: Connect network to containers 1 and 2
docker_network:
name: "{{ nname_1 }}"
state: present
connected:
- "{{ cname_1 }}"
- "{{ cname_2 }}"
register: networks_2
register: networks_3

- name: Connect network to containers 1 and 2 (idempotency)
docker_network:
Expand All @@ -47,7 +63,7 @@
connected:
- "{{ cname_1 }}"
- "{{ cname_2 }}"
register: networks_2_idem
register: networks_3_idem

- name: Connect network to container 3
docker_network:
Expand All @@ -56,7 +72,7 @@
connected:
- "{{ cname_3 }}"
appends: yes
register: networks_3
register: networks_4

- name: Connect network to container 3 (idempotency)
docker_network:
Expand All @@ -65,7 +81,7 @@
connected:
- "{{ cname_3 }}"
appends: yes
register: networks_3_idem
register: networks_4_idem

- name: Disconnect network from container 1
docker_network:
Expand All @@ -74,7 +90,7 @@
connected:
- "{{ cname_2 }}"
- "{{ cname_3 }}"
register: networks_4
register: networks_5

- name: Disconnect network from container 1 (idempotency)
docker_network:
Expand All @@ -83,7 +99,7 @@
connected:
- "{{ cname_2 }}"
- "{{ cname_3 }}"
register: networks_4_idem
register: networks_5_idem

- name: Cleanup
docker_network:
Expand All @@ -101,6 +117,8 @@
# - networks_3_idem is not changed
- networks_4 is changed
# - networks_4_idem is not changed
- networks_5 is changed
# - networks_5_idem is not changed

####################################################################

Expand Down
37 changes: 37 additions & 0 deletions test/integration/targets/docker_network/tasks/tests/substring.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
- name: Registering container and network names
set_fact:
nname_1: "{{ name_prefix ~ '-network-foo' }}"
nname_2: "{{ name_prefix ~ '-network-foobar' }}"
- name: Registering container and network names
set_fact:
dnetworks: "{{ dnetworks }} + [nname_1, nname_2]"

####################################################################

- name: Create network (superstring)
docker_network:
name: "{{ nname_2 }}"
state: present
register: networks_1

- name: Create network (substring)
docker_network:
name: "{{ nname_1 }}"
state: present
register: networks_2

- name: Cleanup
docker_network:
name: "{{ network_name }}"
state: absent
loop:
- "{{ nname_1 }}"
- "{{ nname_2 }}"
loop_control:
loop_var: network_name

- assert:
that:
- networks_1 is changed
- networks_2 is changed