ci: Convert host group names from kebab-case to snake_case

Ansible 2.* and higher emit warnings about snake case, and it may be causing tests to get skipped or behave differently.
4 years ago · 0af057e365
parent 59e6fe5289
commit 0af057e365
114 changed files with 149 additions and 149 deletions
--- a/.ci/ansible_tests.py
+++ b/.ci/ansible_tests.py
@ -47,7 +47,7 @@ with ci_lib.Fold('job_setup'):

    inventory_path = os.path.join(HOSTS_DIR, 'target')
    with open(inventory_path, 'w') as fp:
-        fp.write('[test-targets]\n')
+        fp.write('[test_targets]\n')
        fp.writelines(
            "%(name)s "
            "ansible_host=%(hostname)s "
--- a/tests/ansible/bench/file_transfer.yml
+++ b/tests/ansible/bench/file_transfer.yml
@ -1,6 +1,6 @@

 - name: bench/file_transfer.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/bench/includes.yml
+++ b/tests/ansible/bench/includes.yml
@ -1,4 +1,4 @@
- hosts: test-targets
+- hosts: test_targets
  tasks:
  - include_tasks: _includes.yml
    with_sequence: start=1 end=1000
--- a/tests/ansible/hosts/connection_delegation.hosts
+++ b/tests/ansible/hosts/connection_delegation.hosts
@ -23,14 +23,14 @@ cd-newuser-normal-normal mitogen_via=cd-normal ansible_user=newuser-normal-norma
 cd-newuser-doas-normal mitogen_via=cd-normal ansible_connection=mitogen_doas ansible_user=newuser-doas-normal-user


-[connection-delegation-test]
+[connection_delegation_test]
 cd-bastion
 cd-rack11 mitogen_via=ssh-user@cd-bastion
 cd-rack11a mitogen_via=root@cd-rack11
 cd-rack11a-docker mitogen_via=docker-admin@cd-rack11a ansible_connection=docker


-[connection-delegation-cycle]
+[connection_delegation_cycle]
 # Create cycle with Docker container.
 cdc-bastion mitogen_via=cdc-rack11a-docker
 cdc-rack11 mitogen_via=ssh-user@cdc-bastion
--- a/tests/ansible/hosts/default.hosts
+++ b/tests/ansible/hosts/default.hosts
@ -5,5 +5,5 @@
 # fixed ansible.cfg remote_user setting to test against.
 target ansible_host=localhost ansible_user="{{lookup('env', 'USER')}}"

-[test-targets]
+[test_targets]
 target
--- a/tests/ansible/hosts/group_vars/osa_all_containers.yml
+++ b/tests/ansible/hosts/group_vars/osa_all_containers.yml
--- a/tests/ansible/hosts/k3.hosts
+++ b/tests/ansible/hosts/k3.hosts
@ -3,26 +3,26 @@
 # Used for manual testing.
 k3

-[k3-x10]
+[k3_x10]
 k3-[01:10]

-[k3-x20]
+[k3_x20]
 k3-[01:20]

-[k3-x50]
+[k3_x50]
 k3-[01:50]

-[k3-x100]
+[k3_x100]
 k3-[001:100]

-[k3-x200]
+[k3_x200]
 k3-[001:200]

-[k3-x300]
+[k3_x300]
 k3-[001:300]

-[k3-x400]
+[k3_x400]
 k3-[001:400]

-[k3-x500]
+[k3_x500]
 k3-[001:500]
--- a/tests/ansible/hosts/localhost.hosts
+++ b/tests/ansible/hosts/localhost.hosts
@ -5,32 +5,32 @@
 # behaviour.

 # This is only used for manual testing.
-[localhost-x10]
+[localhost_x10]
 localhost-[001:010]

-[localhost-x20]
+[localhost_x20]
 localhost-[001:020]

-[localhost-x30]
+[localhost_x30]
 localhost-[001:030]

-[localhost-x40]
+[localhost_x40]
 localhost-[001:040]

-[localhost-x50]
+[localhost_x50]
 localhost-[001:050]

-[localhost-x60]
+[localhost_x60]
 localhost-[001:060]

-[localhost-x70]
+[localhost_x70]
 localhost-[001:070]

-[localhost-x80]
+[localhost_x80]
 localhost-[001:080]

-[localhost-x90]
+[localhost_x90]
 localhost-[001:090]

-[localhost-x100]
+[localhost_x100]
 localhost-[001:100]
--- a/tests/ansible/hosts/osa-containers
+++ b/tests/ansible/hosts/osa-containers
@ -3,7 +3,7 @@
 # Patterned after openstack-ansible/all_containers.yml
 osa-host-machine ansible_host=172.29.236.100

-[osa-all-containers]
+[osa_all_containers]
 osa-container-1 container_tech=lxc
 osa-container-2 container_tech=lxc
 osa-container-3 container_tech=lxc
--- a/tests/ansible/integration/action/copy.yml
+++ b/tests/ansible/integration/action/copy.yml
@ -1,7 +1,7 @@
 # Verify copy module for small and large files, and inline content.

 - name: integration/action/copy.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - copy:
--- a/tests/ansible/integration/action/fixup_perms2__copy.yml
+++ b/tests/ansible/integration/action/fixup_perms2__copy.yml
@ -4,7 +4,7 @@
 # regardless, we're testing that no execute bit is set here so either check is ok

 - name: integration/action/fixup_perms2__copy.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    #
--- a/tests/ansible/integration/action/low_level_execute_command.yml
+++ b/tests/ansible/integration/action/low_level_execute_command.yml
@ -1,7 +1,7 @@
 # Verify the behaviour of _low_level_execute_command().

 - name: integration/action/low_level_execute_command.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/action/make_tmp_path.yml
+++ b/tests/ansible/integration/action/make_tmp_path.yml
@ -8,7 +8,7 @@
 #   https://github.com/dw/mitogen/issues/301

 - name: integration/action/make_tmp_path.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - meta: end_play
--- a/tests/ansible/integration/action/remote_expand_user.yml
+++ b/tests/ansible/integration/action/remote_expand_user.yml
@ -2,7 +2,7 @@
 # $HOME expansion.

 - name: integration/action/remote_expand_user.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - name: "Find out root's homedir."
--- a/tests/ansible/integration/action/remote_file_exists.yml
+++ b/tests/ansible/integration/action/remote_file_exists.yml
@ -1,6 +1,6 @@

 - name: integration/action/remote_file_exists.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/action/remove_tmp_path.yml
+++ b/tests/ansible/integration/action/remove_tmp_path.yml
@ -3,7 +3,7 @@
 #
 #
 - name: integration/action/remove_tmp_path.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    #
--- a/tests/ansible/integration/action/synchronize.yml
+++ b/tests/ansible/integration/action/synchronize.yml
@ -1,7 +1,7 @@
 # Verify basic operation of the synchronize module.

 - name: integration/action/synchronize.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  vars:
    ansible_user: mitogen__has_sudo_pubkey
--- a/tests/ansible/integration/action/transfer_data.yml
+++ b/tests/ansible/integration/action/transfer_data.yml
@ -1,6 +1,6 @@

 - name: integration/action/transfer_data.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/async/multiple_items_loop.yml
+++ b/tests/ansible/integration/async/multiple_items_loop.yml
@ -1,7 +1,7 @@
 # issue #414: verify behaviour of async tasks created in a loop.

 - name: integration/async/multiple_items_loop.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/async/result_binary_producing_json.yml
+++ b/tests/ansible/integration/async/result_binary_producing_json.yml
@ -1,7 +1,7 @@

 - name: integration/async/result_binary_producing_json.yml
  gather_facts: true
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/async/result_binary_producing_junk.yml
+++ b/tests/ansible/integration/async/result_binary_producing_junk.yml
@ -1,7 +1,7 @@

 - name: integration/async/result_binary_producing_junk.yml
  gather_facts: true
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/async/result_shell_echo_hi.yml
+++ b/tests/ansible/integration/async/result_shell_echo_hi.yml
@ -1,7 +1,7 @@

 - name: integration/async/result_shell_echo_hi.yml
  gather_facts: true
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/async/runner_new_process.yml
+++ b/tests/ansible/integration/async/runner_new_process.yml
@ -1,7 +1,7 @@
 # Verify async jobs run in a new process.

 - name: integration/async/runner_new_process.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/async/runner_one_job.yml
+++ b/tests/ansible/integration/async/runner_one_job.yml
@ -2,7 +2,7 @@
 # fields.

 - name: integration/async/runner_one_job.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/async/runner_timeout_then_polling.yml
+++ b/tests/ansible/integration/async/runner_timeout_then_polling.yml
@ -1,7 +1,7 @@
 # Verify 'async: <timeout>' functions as desired.

 - name: integration/async/runner_timeout_then_polling.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml
+++ b/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml
@ -1,6 +1,6 @@

 - name: integration/async/runner_two_simultaneous_jobs.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/async/runner_with_polling_and_timeout.yml
+++ b/tests/ansible/integration/async/runner_with_polling_and_timeout.yml
@ -1,7 +1,7 @@
 # Verify 'async: <timeout>' functions as desired.

 - name: integration/async/runner_with_polling_and_timeout.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/become/su_password.yml
+++ b/tests/ansible/integration/become/su_password.yml
@ -2,7 +2,7 @@
  # Ansible can't handle this on OS X. I don't care why.

 - name: integration/become/su_password.yml
-  hosts: test-targets
+  hosts: test_targets
  become_method: su
  any_errors_fatal: true
  tasks:
--- a/tests/ansible/integration/become/sudo_flags_failure.yml
+++ b/tests/ansible/integration/become/sudo_flags_failure.yml
@ -1,5 +1,5 @@
 - name: integration/become/sudo_flags_failure.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/become/sudo_nonexistent.yml
+++ b/tests/ansible/integration/become/sudo_nonexistent.yml
@ -1,5 +1,5 @@
 - name: integration/become/sudo_nonexistent.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/become/sudo_nopassword.yml
+++ b/tests/ansible/integration/become/sudo_nopassword.yml
@ -1,7 +1,7 @@
 # Verify passwordless sudo behaviour in various cases.

 - name: integration/become/sudo_nopassword.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/become/sudo_password.yml
+++ b/tests/ansible/integration/become/sudo_password.yml
@ -1,7 +1,7 @@
 # Verify passwordful sudo behaviour

 - name: integration/become/sudo_password.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/become/sudo_requiretty.yml
+++ b/tests/ansible/integration/become/sudo_requiretty.yml
@ -1,7 +1,7 @@
 # Verify requiretty support

 - name: integration/become/sudo_requiretty.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/connection/_disconnect_during_module.yml
+++ b/tests/ansible/integration/connection/_disconnect_during_module.yml
@ -2,7 +2,7 @@
 ---

 - name: integration/connection/_disconnect_during_module.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: no
  any_errors_fatal: false
  tasks:
--- a/tests/ansible/integration/connection/disconnect_during_module.yml
+++ b/tests/ansible/integration/connection/disconnect_during_module.yml
@ -2,7 +2,7 @@
 ---

 - name: integration/connection/disconnect_during_module.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: no
  any_errors_fatal: false
  tasks:
--- a/tests/ansible/integration/connection/disconnect_resets_connection.yml
+++ b/tests/ansible/integration/connection/disconnect_resets_connection.yml
@ -10,7 +10,7 @@
 ---

 - name: integration/connection/disconnect_resets_connection.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: no
  any_errors_fatal: true
  tasks:
--- a/tests/ansible/integration/connection/exec_command.yml
+++ b/tests/ansible/integration/connection/exec_command.yml
@ -2,7 +2,7 @@
 ---

 - name: integration/connection/exec_command.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: no
  any_errors_fatal: true
  tasks:
--- a/tests/ansible/integration/connection/home_dir.yml
+++ b/tests/ansible/integration/connection/home_dir.yml
@ -1,7 +1,7 @@
 # Verify the value of the Connection.homedir attribute is as expected.

 - name: integration/connection/home_dir.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - name: "Find out root's homedir."
--- a/tests/ansible/integration/connection/put_large_file.yml
+++ b/tests/ansible/integration/connection/put_large_file.yml
@ -2,7 +2,7 @@
 ---

 - name: integration/connection/put_large_file.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: no
  any_errors_fatal: true
  vars:
--- a/tests/ansible/integration/connection/put_small_file.yml
+++ b/tests/ansible/integration/connection/put_small_file.yml
@ -2,7 +2,7 @@
 ---

 - name: integration/connection/put_small_file.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: no
  any_errors_fatal: true
  vars:
--- a/tests/ansible/integration/connection/reset.yml
+++ b/tests/ansible/integration/connection/reset.yml
@ -4,7 +4,7 @@
 ---

 - name: integration/connection/reset.yml
-  hosts: test-targets
+  hosts: test_targets
  tasks:
    - meta: end_play
      when: not is_mitogen
--- a/tests/ansible/integration/connection/reset_become.yml
+++ b/tests/ansible/integration/connection/reset_become.yml
@ -1,7 +1,7 @@
 # issue #633: Connection.reset() should ignore "become", and apply to the login
 # account.

- hosts: test-targets
+- hosts: test_targets
  become: true
  gather_facts: false
  tasks:
--- a/tests/ansible/integration/connection_delegation/delegate_to_template.yml
+++ b/tests/ansible/integration/connection_delegation/delegate_to_template.yml
@ -1,6 +1,6 @@
 # issue #340: Ensure templated delegate_to field works.
 #
-# Here we delegate from "test-targets" group to a templated "{{physical_host}}"
+# Here we delegate from "test_targets" group to a templated "{{physical_host}}"
 # variable, which contains "cd-normal-alias", which has a
 # "mitogen_via=cd-alias", which in turn has an "ansible_host="alias-host".
 #
@ -12,7 +12,7 @@
  vars:
    physical_host: "cd-normal-alias"
    physical_hosts: ["cd-normal-alias", "cd-normal-normal"]
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: no
  any_errors_fatal: true
  tasks:
--- a/tests/ansible/integration/connection_loader/local_blemished.yml
+++ b/tests/ansible/integration/connection_loader/local_blemished.yml
@ -1,7 +1,7 @@
 # Ensure 'local' connections are grabbed.

 - name: integration/connection_loader/local_blemished.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - determine_strategy:
--- a/tests/ansible/integration/connection_loader/paramiko_unblemished.yml
+++ b/tests/ansible/integration/connection_loader/paramiko_unblemished.yml
@ -2,7 +2,7 @@
 ---

 - name: integration/connection_loader/paramiko_unblemished.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - debug:
--- a/tests/ansible/integration/connection_loader/ssh_blemished.yml
+++ b/tests/ansible/integration/connection_loader/ssh_blemished.yml
@ -1,7 +1,7 @@
 # Ensure 'ssh' connections are grabbed.

 - name: integration/connection_loader__ssh_blemished.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - determine_strategy:
--- a/tests/ansible/integration/context_service/disconnect_cleanup.yml
+++ b/tests/ansible/integration/context_service/disconnect_cleanup.yml
@ -2,7 +2,7 @@
 # state of dependent contexts (e.g. sudo, connection delegation, ..).

 - name: integration/context_service/disconnect_cleanup.yml
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  any_errors_fatal: true
  tasks:
  - meta: end_play
--- a/tests/ansible/integration/context_service/lru_one_target.yml
+++ b/tests/ansible/integration/context_service/lru_one_target.yml
@ -1,7 +1,7 @@
 # Verify a maximum number of contexts are possible on one machine.

 - name: integration/context_service/lru_one_target.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  vars:
    max_interps: "{{lookup('env', 'MITOGEN_MAX_INTERPRETERS')}}"
--- a/tests/ansible/integration/context_service/reconnection.yml
+++ b/tests/ansible/integration/context_service/reconnection.yml
@ -2,7 +2,7 @@
 # cleanup of dependent (via=) contexts.

 - name: integration/context_service/reconnection.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - mitogen_shutdown_all:
--- a/tests/ansible/integration/context_service/remote_name.yml
+++ b/tests/ansible/integration/context_service/remote_name.yml
@ -1,7 +1,7 @@
 # issue #581: ensure mitogen_mask_remote_name is respected.

 - name: integration/context_service/remote_name.yml
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  any_errors_fatal: true
  tasks:
  - meta: end_play
--- a/tests/ansible/integration/glibc_caches/resolv_conf.yml
+++ b/tests/ansible/integration/glibc_caches/resolv_conf.yml
@ -4,7 +4,7 @@
 - name: integration/glibc_caches/resolv_conf.yml
  gather_facts: true
  become: true
-  hosts: test-targets
+  hosts: test_targets
  vars:
    ansible_become_pass: has_sudo_pubkey_password
  tasks:
--- a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml
+++ b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml
@ -2,7 +2,7 @@
 ---

 - name: integration/interpreter_discovery/ansible_2_8_tests.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  gather_facts: true
  tasks:
--- a/tests/ansible/integration/interpreter_discovery/complex_args.yml
+++ b/tests/ansible/integration/interpreter_discovery/complex_args.yml
@ -2,7 +2,7 @@
 ---

 - name: integration/interpreter_discovery/complex_args.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  gather_facts: true
  tasks:
--- a/tests/ansible/integration/local/cwd_preserved.yml
+++ b/tests/ansible/integration/local/cwd_preserved.yml
@ -6,7 +6,7 @@

 - name: integration/local/cwd_preserved.yml
  any_errors_fatal: true
-  hosts: test-targets
+  hosts: test_targets
  tasks:
  - connection: local
    command: pwd
--- a/tests/ansible/integration/module_utils/adjacent_to_playbook.yml
+++ b/tests/ansible/integration/module_utils/adjacent_to_playbook.yml
@ -2,7 +2,7 @@
 # external1 is loaded from integration/module_utils/module_utils/..

 - name: integration/module_utils/adjacent_to_playbook.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/module_utils/adjacent_to_role.yml
+++ b/tests/ansible/integration/module_utils/adjacent_to_role.yml
@ -2,7 +2,7 @@
 # external1 is loaded from integration/module_utils/roles/modrole/module_utils/..

 - name: integration/module_utils/adjacent_to_playbook.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  roles:
  - modrole
--- a/tests/ansible/integration/module_utils/from_config_path.yml
+++ b/tests/ansible/integration/module_utils/from_config_path.yml
@ -1,7 +1,7 @@
 # external1 and external2 are loaded from config path.

 - name: integration/module_utils/from_config_path.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/module_utils/from_config_path_pkg.yml
+++ b/tests/ansible/integration/module_utils/from_config_path_pkg.yml
@ -1,7 +1,7 @@
 # external1 and external2 are loaded from config path.

 - name: integration/module_utils/from_config_path.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/module_utils/overrides_builtin.yml
+++ b/tests/ansible/integration/module_utils/overrides_builtin.yml
@ -1,6 +1,6 @@

 - name: integration/module_utils/overrides_builtin.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  roles:
  - overrides_modrole
--- a/tests/ansible/integration/playbook_semantics/become_flags.yml
+++ b/tests/ansible/integration/playbook_semantics/become_flags.yml
@ -3,7 +3,7 @@
 #

 - name: integration/playbook_semantics/become_flags.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

@ -18,7 +18,7 @@
  tags:
    - become_flags

- hosts: test-targets
+- hosts: test_targets
  any_errors_fatal: true
  become_flags: -E
  tasks:
--- a/tests/ansible/integration/playbook_semantics/delegate_to.yml
+++ b/tests/ansible/integration/playbook_semantics/delegate_to.yml
@ -1,5 +1,5 @@
 - name: integration/playbook_semantics/delegate_to.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    #
--- a/tests/ansible/integration/playbook_semantics/environment.yml
+++ b/tests/ansible/integration/playbook_semantics/environment.yml
@ -1,7 +1,7 @@
 # Ensure environment: is preserved during call.

 - name: integration/playbook_semantics/environment.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - shell: echo $SOME_ENV
--- a/tests/ansible/integration/playbook_semantics/with_items.yml
+++ b/tests/ansible/integration/playbook_semantics/with_items.yml
@ -2,7 +2,7 @@
 # the correct context.

 - name: integration/playbook_semantics/with_items.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/process/unix_socket_cleanup.yml
+++ b/tests/ansible/integration/process/unix_socket_cleanup.yml
@ -1,5 +1,5 @@

- hosts: test-targets[0]
+- hosts: test_targets[0]
  tasks:
  - mitogen_action_script:
      script: |
@ -10,7 +10,7 @@
  - shell: >
      ANSIBLE_STRATEGY=mitogen_linear
      ANSIBLE_SSH_ARGS=""
-      ansible -m shell -c local -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets
+      ansible -m shell -c local -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets
    args:
      chdir: ../..
    register: out
--- a/tests/ansible/integration/runner/atexit.yml
+++ b/tests/ansible/integration/runner/atexit.yml
@ -3,7 +3,7 @@
 # completion.

 - name: integration/runner/atexit.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: false
  any_errors_fatal: false
  vars:
--- a/tests/ansible/integration/runner/builtin_command_module.yml
+++ b/tests/ansible/integration/runner/builtin_command_module.yml
@ -1,6 +1,6 @@

 - name: integration/runner/builtin_command_module.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  gather_facts: true
  tasks:
--- a/tests/ansible/integration/runner/crashy_new_style_module.yml
+++ b/tests/ansible/integration/runner/crashy_new_style_module.yml
@ -1,7 +1,7 @@
 # issue #527: catch exceptions from crashy modules.

 - name: integration/runner/crashy_new_style_module.yml
-  hosts: test-targets
+  hosts: test_targets
  tasks:
    - custom_python_run_script:
        script: kaboom
--- a/tests/ansible/integration/runner/custom_bash_hashbang_argument.yml
+++ b/tests/ansible/integration/runner/custom_bash_hashbang_argument.yml
@ -1,6 +1,6 @@
 # https://github.com/dw/mitogen/issues/291
 - name: integration/runner/custom_bash_hashbang_argument.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/runner/custom_bash_old_style_module.yml
+++ b/tests/ansible/integration/runner/custom_bash_old_style_module.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_bash_old_style_module.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/runner/custom_bash_want_json_module.yml
+++ b/tests/ansible/integration/runner/custom_bash_want_json_module.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_bash_want_json_module.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - custom_bash_want_json_module:
--- a/tests/ansible/integration/runner/custom_binary_producing_json.yml
+++ b/tests/ansible/integration/runner/custom_binary_producing_json.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_binary_producing_json.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  gather_facts: true
  tasks:
--- a/tests/ansible/integration/runner/custom_binary_producing_junk.yml
+++ b/tests/ansible/integration/runner/custom_binary_producing_junk.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_binary_producing_junk.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: true
  tasks:
    - block:
@ -23,7 +23,7 @@
    - custom_binary_producing_junk


- hosts: test-targets
+- hosts: test_targets
  any_errors_fatal: true
  tasks:
    - assert:
--- a/tests/ansible/integration/runner/custom_binary_single_null.yml
+++ b/tests/ansible/integration/runner/custom_binary_single_null.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_binary_single_null.yml
-  hosts: test-targets
+  hosts: test_targets
  tasks:
    - custom_binary_single_null:
        foo: true
@ -9,7 +9,7 @@
  tags:
    - custom_binary_single_null

- hosts: test-targets
+- hosts: test_targets
  any_errors_fatal: true
  tasks:
  - assert:
--- a/tests/ansible/integration/runner/custom_perl_json_args_module.yml
+++ b/tests/ansible/integration/runner/custom_perl_json_args_module.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_perl_json_args_module.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - custom_perl_json_args_module:
--- a/tests/ansible/integration/runner/custom_perl_want_json_module.yml
+++ b/tests/ansible/integration/runner/custom_perl_want_json_module.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_perl_want_json_module.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - custom_perl_want_json_module:
--- a/tests/ansible/integration/runner/custom_python_json_args_module.yml
+++ b/tests/ansible/integration/runner/custom_python_json_args_module.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_python_json_args_module.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - custom_python_json_args_module:
--- a/tests/ansible/integration/runner/custom_python_new_style_missing_interpreter.yml
+++ b/tests/ansible/integration/runner/custom_python_new_style_missing_interpreter.yml
@ -1,6 +1,6 @@

 - name: integration/runner/custom_python_new_style_module.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - custom_python_new_style_missing_interpreter:
--- a/tests/ansible/integration/runner/custom_python_new_style_module.yml
+++ b/tests/ansible/integration/runner/custom_python_new_style_module.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_python_new_style_module.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    # without Mitogen Ansible 2.10 hangs on this play
--- a/tests/ansible/integration/runner/custom_python_prehistoric_module.yml
+++ b/tests/ansible/integration/runner/custom_python_prehistoric_module.yml
@ -1,7 +1,7 @@
 # issue #555

 - name: integration/runner/custom_python_prehistoric_module.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - custom_python_prehistoric_module:
--- a/tests/ansible/integration/runner/custom_python_want_json_module.yml
+++ b/tests/ansible/integration/runner/custom_python_want_json_module.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_python_want_json_module.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:
    - custom_python_want_json_module:
--- a/tests/ansible/integration/runner/custom_script_interpreter.yml
+++ b/tests/ansible/integration/runner/custom_script_interpreter.yml
@ -1,5 +1,5 @@
 - name: integration/runner/custom_script_interpreter.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/runner/environment_isolation.yml
+++ b/tests/ansible/integration/runner/environment_isolation.yml
@ -2,7 +2,7 @@


 - name: integration/runner/environment_isolation.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  gather_facts: true
  tasks:
--- a/tests/ansible/integration/runner/etc_environment.yml
+++ b/tests/ansible/integration/runner/etc_environment.yml
@ -3,7 +3,7 @@
 # but less likely to brick a development workstation

 - name: integration/runner/etc_environment.yml
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  any_errors_fatal: true
  gather_facts: true
  tasks:
--- a/tests/ansible/integration/runner/forking_active.yml
+++ b/tests/ansible/integration/runner/forking_active.yml
@ -1,5 +1,5 @@
 - name: integration/runner/forking_active.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/runner/forking_correct_parent.yml
+++ b/tests/ansible/integration/runner/forking_correct_parent.yml
@ -1,6 +1,6 @@

 - name: integration/runner/forking_correct_parent.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/runner/forking_inactive.yml
+++ b/tests/ansible/integration/runner/forking_inactive.yml
@ -1,7 +1,7 @@
 # Verify non-async jobs run in-process.

 - name: integration/runner/forking_inactive.yml
-  hosts: test-targets
+  hosts: test_targets
  any_errors_fatal: true
  tasks:

--- a/tests/ansible/integration/runner/missing_module.yml
+++ b/tests/ansible/integration/runner/missing_module.yml
@ -1,13 +1,13 @@

 - name: integration/runner/missing_module.yml
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  connection: local
  tasks:
    - connection: local
      command: |
        ansible -vvv
        -i "{{MITOGEN_INVENTORY_FILE}}"
-        test-targets
+        test_targets
        -m missing_module
      args:
        chdir: ../..
--- a/tests/ansible/integration/ssh/config.yml
+++ b/tests/ansible/integration/ssh/config.yml
@ -1,7 +1,7 @@
 # issue #334: test expanduser() on key file during config generation.

 - name: integration/ssh/config.yml
-  hosts: test-targets
+  hosts: test_targets
  connection: ssh
  vars:
    ansible_private_key_file: ~/fakekey
--- a/tests/ansible/integration/ssh/timeouts.yml
+++ b/tests/ansible/integration/ssh/timeouts.yml
@ -1,13 +1,13 @@
 # Ensure 'ssh' connections time out correctly.

 - name: integration/ssh/timeouts.yml
-  hosts: test-targets
+  hosts: test_targets
  tasks:
    - connection: local
      command: |
        ansible -vvv
        -i "{{MITOGEN_INVENTORY_FILE}}"
-        test-targets
+        test_targets
        -m custom_python_detect_environment
        -e ansible_user=mitogen__slow_user -e ansible_password=slow_user_password
      args:
--- a/tests/ansible/integration/ssh/variables.yml
+++ b/tests/ansible/integration/ssh/variables.yml
@ -3,7 +3,7 @@
 # whatever reason.

 - name: integration/ssh/variables.yml
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  connection: local
  vars:
    # ControlMaster has the effect of caching the previous auth to the same
@ -18,7 +18,7 @@
      shell: >
        ANSIBLE_STRATEGY=mitogen_linear
        ANSIBLE_SSH_ARGS=""
-        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets
+        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets
        -e ansible_ssh_user=mitogen__has_sudo
        -e ansible_ssh_pass=has_sudo_password
      args:
@ -29,7 +29,7 @@
    - shell: >
        ANSIBLE_STRATEGY=mitogen_linear
        ANSIBLE_SSH_ARGS=""
-        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets
+        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets
        -e ansible_ssh_user=mitogen__has_sudo
        -e ansible_ssh_pass=wrong_password
      args:
@ -48,7 +48,7 @@
      shell: >
        ANSIBLE_STRATEGY=mitogen_linear
        ANSIBLE_SSH_ARGS=""
-        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets
+        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets
        -e ansible_user=mitogen__has_sudo
        -e ansible_ssh_pass=has_sudo_password
      args:
@ -59,7 +59,7 @@
    - shell: >
        ANSIBLE_STRATEGY=mitogen_linear
        ANSIBLE_SSH_ARGS=""
-        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets
+        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets
        -e ansible_user=mitogen__has_sudo
        -e ansible_ssh_pass=wrong_password
      args:
@ -78,7 +78,7 @@
      shell: >
        ANSIBLE_STRATEGY=mitogen_linear
        ANSIBLE_SSH_ARGS=""
-        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets
+        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets
        -e ansible_user=mitogen__has_sudo
        -e ansible_password=has_sudo_password
      args:
@ -89,7 +89,7 @@
    - shell: >
        ANSIBLE_STRATEGY=mitogen_linear
        ANSIBLE_SSH_ARGS=""
-        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets
+        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets
        -e ansible_user=mitogen__has_sudo
        -e ansible_password=wrong_password
      args:
@ -113,7 +113,7 @@
      shell: >
        ANSIBLE_STRATEGY=mitogen_linear
        ANSIBLE_SSH_ARGS=""
-        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets
+        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets
        -e ansible_user=mitogen__has_sudo_pubkey
        -e ansible_ssh_private_key_file=../data/docker/mitogen__has_sudo_pubkey.key
      args:
@ -124,7 +124,7 @@
    - shell: >
        ANSIBLE_STRATEGY=mitogen_linear
        ANSIBLE_SSH_ARGS=""
-        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets
+        ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test_targets
        -e ansible_user=mitogen__has_sudo
        -e ansible_ssh_private_key_file=/dev/null
      args:
--- a/tests/ansible/integration/strategy/_mixed_mitogen_vanilla.yml
+++ b/tests/ansible/integration/strategy/_mixed_mitogen_vanilla.yml
@ -2,7 +2,7 @@
 # issue #294: ensure running mixed vanilla/Mitogen succeeds.

 - name: integration/strategy/_mixed_mitogen_vanilla.yml (mitogen_linear)
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  any_errors_fatal: true
  strategy: mitogen_linear
  run_once: true
@ -21,7 +21,7 @@
    - mitogen_linear

 - name: integration/strategy/_mixed_mitogen_vanilla.yml (linear)
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  any_errors_fatal: true
  strategy: linear
  tasks:
@ -39,7 +39,7 @@
    - linear

 - name: integration/strategy/_mixed_mitogen_vanilla.yml (mitogen_linear)
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  any_errors_fatal: true
  strategy: mitogen_linear
  tasks:
--- a/tests/ansible/integration/strategy/_mixed_vanilla_mitogen.yml
+++ b/tests/ansible/integration/strategy/_mixed_vanilla_mitogen.yml
@ -2,7 +2,7 @@
 # issue #294: ensure running mixed vanilla/Mitogen succeeds.

 - name: integration/strategy/_mixed_vanilla_mitogen.yml (linear)
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  any_errors_fatal: true
  strategy: linear
  tasks:
@ -20,7 +20,7 @@
    - linear

 - name: integration/strategy/_mixed_vanilla_mitogen.yml (mitogen_linear)
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  any_errors_fatal: true
  strategy: mitogen_linear
  tasks:
@ -38,7 +38,7 @@
    - mitogen_linear

 - name: integration/strategy/_mixed_vanilla_mitogen.yml (linear)
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  any_errors_fatal: true
  strategy: linear
  tasks:
--- a/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml
+++ b/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml
@ -1,6 +1,6 @@

 - name: integration/strategy/mixed_vanilla_mitogen.yml (linear->mitogen->linear)
-  hosts: test-targets[0]
+  hosts: test_targets[0]
  any_errors_fatal: true
  tasks:
    - connection: local
--- a/tests/ansible/integration/stub_connections/kubectl.yml
+++ b/tests/ansible/integration/stub_connections/kubectl.yml
@ -1,6 +1,6 @@

 - name: integration/stub_connections/kubectl.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: false
  any_errors_fatal: true
  tasks:
--- a/tests/ansible/integration/stub_connections/lxc.yml
+++ b/tests/ansible/integration/stub_connections/lxc.yml
@ -1,6 +1,6 @@

 - name: integration/stub_connections/lxc.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: false
  any_errors_fatal: true
  tasks:
--- a/tests/ansible/integration/stub_connections/lxd.yml
+++ b/tests/ansible/integration/stub_connections/lxd.yml
@ -1,6 +1,6 @@

 - name: integration/stub_connections/lxd.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: false
  any_errors_fatal: true
  tasks:
--- a/tests/ansible/integration/stub_connections/mitogen_doas.yml
+++ b/tests/ansible/integration/stub_connections/mitogen_doas.yml
@ -1,6 +1,6 @@

 - name: integration/stub_connections/mitogen_doas.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: false
  any_errors_fatal: true
  tasks:
--- a/tests/ansible/integration/stub_connections/mitogen_sudo.yml
+++ b/tests/ansible/integration/stub_connections/mitogen_sudo.yml
@ -1,6 +1,6 @@

 - name: integration/stub_connections/mitogen_sudo.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: false
  any_errors_fatal: true
  tasks:
--- a/tests/ansible/integration/stub_connections/setns_lxc.yml
+++ b/tests/ansible/integration/stub_connections/setns_lxc.yml
@ -3,7 +3,7 @@
 # child Ansible via sudo. But that only works if sudo works.

 - name: integration/stub_connections/setns_lxc.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: false
  any_errors_fatal: false
  connection: local
--- a/tests/ansible/integration/stub_connections/setns_lxd.yml
+++ b/tests/ansible/integration/stub_connections/setns_lxd.yml
@ -3,7 +3,7 @@
 # child Ansible via sudo. But that only works if sudo works.

 - name: integration/stub_connections/setns_lxd.yml
-  hosts: test-targets
+  hosts: test_targets
  gather_facts: false
  any_errors_fatal: false
  connection: local
--- a/Show More
+++ b/Show More