Skip to content

Commit 45472c6

Browse files
authored
Merge pull request #1227 from moreati/rename-tc-via-tests
tests: Name transport_config tests that involve mitogen_via
2 parents fca7578 + f82c72f commit 45472c6

File tree

13 files changed

+77
-39
lines changed

13 files changed

+77
-39
lines changed

docs/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ In progress (unreleased)
3434
error handling
3535
* :gh:issue:`1213` :mod:`ansible_mitogen`: Return ``stderr_lines`` from
3636
``_low_level_execute_command()``
37+
* :gh:issue:`1227` tests: Name transport_config tests that use ``mitogen_via``
3738

3839

3940
v0.3.21 (2025-01-20)

tests/ansible/integration/transport_config/become.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
tags:
1818
- mitogen_only
1919

20-
- hosts: tc-become-unset
20+
- name: tc-become-unset via becomeuser@tc-become-set
21+
hosts: tc-become-unset
2122
vars: {mitogen_via: becomeuser@tc-become-set}
2223
tasks:
2324
- include_tasks: ../_mitogen_only.yml
@@ -59,7 +60,8 @@
5960
tags:
6061
- mitogen_only
6162

62-
- hosts: tc-become-set
63+
- name: tc-become-set via tc-become-unset
64+
hosts: tc-become-set
6365
vars: {mitogen_via: tc-become-unset}
6466
become: true
6567
become_user: becomeuser

tests/ansible/integration/transport_config/become_method.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
tags:
1919
- mitogen_only
2020

21-
- hosts: tc-become-method-unset
21+
- name: tc-become-method-unset via becomeuser@tc-become-method-su
22+
hosts: tc-become-method-unset
2223
vars: {mitogen_via: becomeuser@tc-become-method-su}
2324
tasks:
2425
- include_tasks: ../_mitogen_only.yml
@@ -55,7 +56,8 @@
5556
tags:
5657
- mitogen_only
5758

58-
- hosts: tc-become-method-su
59+
- name: tc-become-method-su via tc-become-method-unset
60+
hosts: tc-become-method-su
5961
vars: {mitogen_via: tc-become-method-unset}
6062
become: true
6163
become_user: becomeuser
@@ -79,9 +81,9 @@
7981
- mitogen_only
8082

8183

82-
8384
# mitogen_via used to specify explicit become method
84-
- hosts: tc-become-method-unset
85+
- name: tc-become-method-unset via doas:doasuser@tc-become-method-su
86+
hosts: tc-become-method-unset
8587
vars: {mitogen_via: "doas:doasuser@tc-become-method-su"}
8688
tasks:
8789
- include_tasks: ../_mitogen_only.yml

tests/ansible/integration/transport_config/become_pass.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979

8080

8181
# ansible_become_password=, via=
82-
- hosts: tc-become-pass-password
82+
- name: tc-become-pass-password via root@tc-become-pass-pass
83+
hosts: tc-become-pass-password
8384
vars: {mitogen_via: root@tc-become-pass-pass}
8485
become: true
8586
tasks:
@@ -119,7 +120,8 @@
119120

120121

121122
# ansible_become_pass=, via=
122-
- hosts: tc-become-pass-pass
123+
- name: tc-become-pass-pass via root@tc-become-pass-password
124+
hosts: tc-become-pass-pass
123125
vars: {mitogen_via: root@tc-become-pass-password}
124126
become: true
125127
tasks:
@@ -161,7 +163,8 @@
161163

162164

163165
# both, mitogen_via
164-
- hosts: tc-become-pass-unset
166+
- name: tc-become-pass-unset via root@tc-become-pass-both
167+
hosts: tc-become-pass-unset
165168
vars: {mitogen_via: root@tc-become-pass-both}
166169
tasks:
167170
- include_tasks: ../_mitogen_only.yml

tests/ansible/integration/transport_config/become_user.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979

8080

8181
# ansible_become_user=, unbecoming via=
82-
- hosts: tc-become-user-set
82+
- name: tc-become-user-set via tc-become-user-unset
83+
hosts: tc-become-user-set
8384
vars: {mitogen_via: tc-become-user-unset}
8485
become: true
8586
tasks:
@@ -103,7 +104,8 @@
103104

104105

105106
# ansible_become_user=, becoming via=
106-
- hosts: tc-become-user-set
107+
- name: tc-become-user-set via doas:doasuser@tc-become-user-unset
108+
hosts: tc-become-user-set
107109
vars: {mitogen_via: "doas:doasuser@tc-become-user-unset"}
108110
become: true
109111
tasks:

tests/ansible/integration/transport_config/host_key_checking.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
tags:
1616
- mitogen_only
1717

18-
- hosts: tc-hkc-unset
18+
- name: tc-hkc-unset via tc-hkc-host-key-checking
19+
hosts: tc-hkc-unset
1920
vars:
2021
mitogen_via: tc-hkc-host-key-checking
2122
tasks:
@@ -48,7 +49,8 @@
4849
tags:
4950
- mitogen_only
5051

51-
- hosts: tc-hkc-host-key-checking
52+
- name: tc-hkc-host-key-checking via tc-hkc-unset
53+
hosts: tc-hkc-host-key-checking
5254
vars:
5355
mitogen_via: tc-hkc-unset
5456
tasks:
@@ -81,7 +83,8 @@
8183
tags:
8284
- mitogen_only
8385

84-
- hosts: tc-hkc-ssh-host-key-checking
86+
- name: tc-hkc-ssh-host-key-checking via tc-hkc-unset
87+
hosts: tc-hkc-ssh-host-key-checking
8588
vars:
8689
mitogen_via: tc-hkc-unset
8790
tasks:

tests/ansible/integration/transport_config/password.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
tags:
1515
- mitogen_only
1616

17-
- hosts: tc-password-unset
17+
- name: tc-password-unset via tc-password-explicit-ssh
18+
hosts: tc-password-unset
1819
vars: {mitogen_via: tc-password-explicit-ssh}
1920
tasks:
2021
- include_tasks: ../_mitogen_only.yml
@@ -41,7 +42,8 @@
4142
tags:
4243
- mitogen_only
4344

44-
- hosts: tc-password-explicit-ssh
45+
- name: tc-password-explicit-ssh via tc-password-unset
46+
hosts: tc-password-explicit-ssh
4547
vars: {mitogen_via: tc-password-unset}
4648
tasks:
4749
- include_tasks: ../_mitogen_only.yml
@@ -68,7 +70,8 @@
6870
tags:
6971
- mitogen_only
7072

71-
- hosts: tc-password-explicit-pass
73+
- name: tc-password-explicit-pass via tc-password-unset
74+
hosts: tc-password-explicit-pass
7275
vars: {mitogen_via: tc-password-unset}
7376
tasks:
7477
- include_tasks: ../_mitogen_only.yml
@@ -95,7 +98,8 @@
9598
tags:
9699
- mitogen_only
97100

98-
- hosts: tc-password-explicit-both
101+
- name: tc-password-explicit-both via tc-password-unset
102+
hosts: tc-password-explicit-both
99103
vars: {mitogen_via: tc-password-unset}
100104
tasks:
101105
- include_tasks: ../_mitogen_only.yml

tests/ansible/integration/transport_config/port.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
- mitogen_only
2121

2222
# Not set, mitogen_via=
23-
- hosts: tc-port-explicit-ssh
23+
- name: tc-port-explicit-ssh via tc-port-unset
24+
hosts: tc-port-explicit-ssh
2425
vars: {mitogen_via: tc-port-unset}
2526
tasks:
2627
- include_tasks: ../_mitogen_only.yml
@@ -52,7 +53,8 @@
5253
tags:
5354
- mitogen_only
5455

55-
- hosts: tc-port-unset
56+
- name: tc-port-unset via tc-port-explicit-ssh
57+
hosts: tc-port-unset
5658
vars: {mitogen_via: tc-port-explicit-ssh}
5759
tasks:
5860
- include_tasks: ../_mitogen_only.yml
@@ -86,7 +88,8 @@
8688
tags:
8789
- mitogen_only
8890

89-
- hosts: tc-port-unset
91+
- name: tc-port-unset via tc-port-explicit-port
92+
hosts: tc-port-unset
9093
vars: {mitogen_via: tc-port-explicit-port}
9194
tasks:
9295
- include_tasks: ../_mitogen_only.yml
@@ -121,7 +124,8 @@
121124
tags:
122125
- mitogen_only
123126

124-
- hosts: tc-port-unset
127+
- name: tc-port-unset via tc-port-both
128+
hosts: tc-port-unset
125129
vars: {mitogen_via: tc-port-both}
126130
tasks:
127131
- include_tasks: ../_mitogen_only.yml

tests/ansible/integration/transport_config/python_path.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
tags:
2121
- mitogen_only
2222

23-
- hosts: tc-python-path-hostvar
23+
- name: tc-python-path-hostvar via tc-python-path-unset
24+
hosts: tc-python-path-hostvar
2425
vars: {mitogen_via: tc-python-path-unset}
2526
tasks:
2627
- include_tasks: ../_mitogen_only.yml
@@ -49,7 +50,8 @@
4950
tags:
5051
- mitogen_only
5152

52-
- hosts: tc-python-path-unset
53+
- name: tc-python-path-unset via tc-python-path-hostvar
54+
hosts: tc-python-path-unset
5355
vars: {mitogen_via: tc-python-path-hostvar}
5456
tasks:
5557
- include_tasks: ../_mitogen_only.yml
@@ -78,7 +80,8 @@
7880
tags:
7981
- mitogen_only
8082

81-
- hosts: tc-python-path-unset
83+
- name: tc-python-path-unset via localhost
84+
hosts: tc-python-path-unset
8285
vars: {mitogen_via: localhost}
8386
tasks:
8487
- include_tasks: ../_mitogen_only.yml
@@ -108,7 +111,8 @@
108111
- mitogen_only
109112

110113

111-
- hosts: localhost
114+
- name: localhost via tc-python-path-local-unset
115+
hosts: localhost
112116
vars: {mitogen_via: tc-python-path-local-unset}
113117
tasks:
114118
- include_tasks: ../_mitogen_only.yml
@@ -134,7 +138,8 @@
134138
tags:
135139
- mitogen_only
136140

137-
- hosts: localhost
141+
- name: localhost via tc-python-path-local-explicit
142+
hosts: localhost
138143
vars: {mitogen_via: tc-python-path-local-explicit}
139144
tasks:
140145
- include_tasks: ../_mitogen_only.yml

tests/ansible/integration/transport_config/remote_addr.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
tags:
1616
- mitogen_only
1717

18-
- hosts: tc-remote-addr-unset
18+
- name: tc-remote-addr-unset via tc-remote-addr-explicit-ssh
19+
hosts: tc-remote-addr-unset
1920
vars: {mitogen_via: tc-remote-addr-explicit-ssh}
2021
tasks:
2122
- include_tasks: ../_mitogen_only.yml
@@ -42,7 +43,8 @@
4243
tags:
4344
- mitogen_only
4445

45-
- hosts: tc-remote-addr-explicit-ssh
46+
- name: tc-remote-addr-explicit-ssh via tc-remote-addr-unset
47+
hosts: tc-remote-addr-explicit-ssh
4648
vars: {mitogen_via: tc-remote-addr-unset}
4749
tasks:
4850
- include_tasks: ../_mitogen_only.yml
@@ -69,7 +71,8 @@
6971
tags:
7072
- mitogen_only
7173

72-
- hosts: tc-remote-addr-explicit-host
74+
- name: tc-remote-addr-explicit-host via tc-remote-addr-unset
75+
hosts: tc-remote-addr-explicit-host
7376
vars: {mitogen_via: tc-remote-addr-unset}
7477
tasks:
7578
- include_tasks: ../_mitogen_only.yml
@@ -96,7 +99,8 @@
9699
tags:
97100
- mitogen_only
98101

99-
- hosts: tc-remote-addr-explicit-both
102+
- name: tc-remote-addr-explicit-both via tc-remote-addr-unset
103+
hosts: tc-remote-addr-explicit-both
100104
vars: {mitogen_via: tc-remote-addr-unset}
101105
tasks:
102106
- include_tasks: ../_mitogen_only.yml

0 commit comments

Comments
 (0)