From 3c58215a91769362cc49f9f53a7acb0eaed7b904 Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Tue, 2 Nov 2021 20:07:28 +0000 Subject: [PATCH] tests: Tag Ansible tests This makes it easier to run subsets using ANSIBLE_RUN_TAGS=... --- tests/ansible/all.yml | 4 +++- tests/ansible/integration/action/copy.yml | 2 ++ .../integration/action/fixup_perms2__copy.yml | 2 ++ .../action/low_level_execute_command.yml | 2 ++ .../integration/action/make_tmp_path.yml | 2 ++ .../action/make_tmp_path__double.yml | 2 ++ .../integration/action/remote_expand_user.yml | 2 ++ .../integration/action/remote_file_exists.yml | 3 ++- .../integration/action/remove_tmp_path.yml | 2 ++ .../integration/action/synchronize.yml | 2 ++ .../integration/action/transfer_data.yml | 2 ++ tests/ansible/integration/all.yml | 18 +++++++++++++++++ .../integration/async/multiple_items_loop.yml | 2 ++ .../async/result_binary_producing_json.yml | 2 ++ .../async/result_binary_producing_junk.yml | 2 ++ .../async/result_shell_echo_hi.yml | 2 ++ .../integration/async/runner_new_process.yml | 2 ++ .../integration/async/runner_one_job.yml | 2 ++ .../async/runner_timeout_then_polling.yml | 2 ++ .../async/runner_two_simultaneous_jobs.yml | 2 ++ .../async/runner_with_polling_and_timeout.yml | 3 ++- .../integration/become/su_password.yml | 3 +++ .../integration/become/sudo_flags_failure.yml | 3 +++ .../integration/become/sudo_nonexistent.yml | 3 +++ .../integration/become/sudo_nopassword.yml | 5 ++++- .../integration/become/sudo_password.yml | 3 +++ .../integration/become/sudo_requiretty.yml | 3 +++ .../connection/become_same_user.yml | 2 ++ .../connection/disconnect_during_module.yml | 3 +++ .../disconnect_resets_connection.yml | 3 +++ .../integration/connection/exec_command.yml | 2 ++ .../integration/connection/home_dir.yml | 2 ++ .../integration/connection/put_large_file.yml | 3 +++ .../integration/connection/put_small_file.yml | 3 +++ .../ansible/integration/connection/reset.yml | 2 ++ .../integration/connection/reset_become.yml | 2 ++ .../delegate_to_template.yml | 2 ++ .../connection_delegation/local_action.yml | 2 ++ .../osa_container_standalone.yml | 3 +++ .../osa_delegate_to_self.yml | 3 +++ .../stack_construction.yml | 20 +++++++++++++++++++ .../connection_loader/local_blemished.yml | 3 +++ .../paramiko_unblemished.yml | 3 +++ .../connection_loader/ssh_blemished.yml | 3 +++ .../context_service/disconnect_cleanup.yml | 2 ++ .../context_service/lru_one_target.yml | 2 ++ .../context_service/reconnection.yml | 2 ++ .../context_service/remote_name.yml | 3 ++- .../integration/glibc_caches/resolv_conf.yml | 2 ++ .../ansible_2_8_tests.yml | 2 ++ .../interpreter_discovery/complex_args.yml | 2 ++ .../integration/local/cwd_preserved.yml | 3 ++- .../integration/local/env_preserved.yml | 2 ++ .../module_utils/adjacent_to_playbook.yml | 3 ++- .../module_utils/adjacent_to_role.yml | 2 ++ .../module_utils/from_config_path.yml | 3 ++- .../module_utils/from_config_path_pkg.yml | 3 ++- .../module_utils/overrides_builtin.yml | 2 ++ .../playbook_semantics/become_flags.yml | 4 ++++ .../playbook_semantics/delegate_to.yml | 2 ++ .../playbook_semantics/environment.yml | 2 ++ .../playbook_semantics/with_items.yml | 2 ++ .../process/unix_socket_cleanup.yml | 2 ++ tests/ansible/integration/runner/atexit.yml | 2 ++ .../runner/builtin_command_module.yml | 2 ++ .../runner/crashy_new_style_module.yml | 2 ++ .../runner/custom_bash_hashbang_argument.yml | 2 ++ .../runner/custom_bash_old_style_module.yml | 2 ++ .../runner/custom_bash_want_json_module.yml | 2 ++ .../runner/custom_binary_producing_json.yml | 2 ++ .../runner/custom_binary_producing_junk.yml | 4 ++++ .../runner/custom_binary_single_null.yml | 5 ++++- .../runner/custom_perl_json_args_module.yml | 2 ++ .../runner/custom_perl_want_json_module.yml | 2 ++ .../runner/custom_python_json_args_module.yml | 2 ++ ...m_python_new_style_missing_interpreter.yml | 2 ++ .../runner/custom_python_new_style_module.yml | 2 ++ .../custom_python_prehistoric_module.yml | 2 ++ .../runner/custom_python_want_json_module.yml | 2 ++ .../runner/custom_script_interpreter.yml | 3 ++- .../runner/environment_isolation.yml | 3 ++- .../integration/runner/etc_environment.yml | 2 ++ .../integration/runner/forking_active.yml | 2 ++ .../runner/forking_correct_parent.yml | 3 +++ .../integration/runner/forking_inactive.yml | 3 ++- .../integration/runner/missing_module.yml | 3 +++ tests/ansible/integration/ssh/config.yml | 2 ++ tests/ansible/integration/ssh/timeouts.yml | 2 ++ .../strategy/_mixed_mitogen_vanilla.yml | 8 ++++++-- .../strategy/_mixed_vanilla_mitogen.yml | 7 ++++++- .../strategy/mixed_vanilla_mitogen.yml | 2 ++ .../integration/stub_connections/kubectl.yml | 2 ++ .../integration/stub_connections/lxc.yml | 2 ++ .../integration/stub_connections/lxd.yml | 2 ++ .../stub_connections/mitogen_doas.yml | 2 ++ .../stub_connections/mitogen_sudo.yml | 2 ++ .../stub_connections/setns_lxc.yml | 2 ++ .../stub_connections/setns_lxd.yml | 2 ++ tests/ansible/integration/transport/all.yml | 2 ++ tests/ansible/regression/all.yml | 15 ++++++++++++++ ..._109__target_has_old_ansible_installed.yml | 2 ++ .../issue_113__duplicate_module_imports.yml | 2 ++ .../issue_118__script_not_marked_exec.yml | 2 ++ .../issue_122__environment_difference.yml | 2 ++ .../regression/issue_140__thread_pileup.yml | 1 + ...ue_152__local_action_wrong_interpreter.yml | 2 ++ .../issue_152__virtualenv_python_fails.yml | 2 ++ .../issue_154__module_state_leaks.yml | 2 ++ .../issue_177__copy_module_failing.yml | 2 ++ ...32_ansiblemoduleerror_first_occurrence.yml | 2 ++ .../regression/issue_558_unarchive_failed.yml | 2 ++ .../issue_590__sys_modules_crap.yml | 2 ++ .../issue_591__setuptools_cwd_crash.yml | 2 ++ .../issue_615__streaming_transfer.yml | 2 ++ .../issue_655__wait_for_connection_error.yml | 2 ++ 115 files changed, 309 insertions(+), 16 deletions(-) diff --git a/tests/ansible/all.yml b/tests/ansible/all.yml index 06f3acdb..e8bf26f2 100644 --- a/tests/ansible/all.yml +++ b/tests/ansible/all.yml @@ -1,4 +1,6 @@ - include: setup/all.yml + tags: setup - include: regression/all.yml + tags: regression - include: integration/all.yml - + tags: integration diff --git a/tests/ansible/integration/action/copy.yml b/tests/ansible/integration/action/copy.yml index 1cab2b34..611ff3f2 100644 --- a/tests/ansible/integration/action/copy.yml +++ b/tests/ansible/integration/action/copy.yml @@ -82,3 +82,5 @@ - /tmp/copy-large-inline-file.out # end of cleaning out files (again) + tags: + - copy diff --git a/tests/ansible/integration/action/fixup_perms2__copy.yml b/tests/ansible/integration/action/fixup_perms2__copy.yml index e5b10005..1ba19e6f 100644 --- a/tests/ansible/integration/action/fixup_perms2__copy.yml +++ b/tests/ansible/integration/action/fixup_perms2__copy.yml @@ -114,3 +114,5 @@ - /tmp/copy-with-mode.out # end of cleaning out files + tags: + - fixup_perms2__copy diff --git a/tests/ansible/integration/action/low_level_execute_command.yml b/tests/ansible/integration/action/low_level_execute_command.yml index 7dc74473..7f91bdf8 100644 --- a/tests/ansible/integration/action/low_level_execute_command.yml +++ b/tests/ansible/integration/action/low_level_execute_command.yml @@ -41,3 +41,5 @@ ["root"], ) fail_msg: raw={{raw}} + tags: + - low_level_execute_command diff --git a/tests/ansible/integration/action/make_tmp_path.yml b/tests/ansible/integration/action/make_tmp_path.yml index ab2db0fb..bfebeffd 100644 --- a/tests/ansible/integration/action/make_tmp_path.yml +++ b/tests/ansible/integration/action/make_tmp_path.yml @@ -160,3 +160,5 @@ - out.module_path.startswith(good_temp_path2) - out.module_tmpdir.startswith(good_temp_path2) fail_msg: out={{out}} + tags: + - make_tmp_path diff --git a/tests/ansible/integration/action/make_tmp_path__double.yml b/tests/ansible/integration/action/make_tmp_path__double.yml index 8b24d322..811e159d 100644 --- a/tests/ansible/integration/action/make_tmp_path__double.yml +++ b/tests/ansible/integration/action/make_tmp_path__double.yml @@ -18,3 +18,5 @@ script: | assert not self._remote_file_exists("{{ out.t1 }}") assert not self._remote_file_exists("{{ out.t2 }}") + tags: + - make_tmp_path_double diff --git a/tests/ansible/integration/action/remote_expand_user.yml b/tests/ansible/integration/action/remote_expand_user.yml index 851da502..8e31f657 100644 --- a/tests/ansible/integration/action/remote_expand_user.yml +++ b/tests/ansible/integration/action/remote_expand_user.yml @@ -110,3 +110,5 @@ - assert: that: out.result == '$HOME/foo' fail_msg: out={{out}} + tags: + - remote_expand_user diff --git a/tests/ansible/integration/action/remote_file_exists.yml b/tests/ansible/integration/action/remote_file_exists.yml index 209f7830..2d206930 100644 --- a/tests/ansible/integration/action/remote_file_exists.yml +++ b/tests/ansible/integration/action/remote_file_exists.yml @@ -35,4 +35,5 @@ - file: path: /tmp/does-exist state: absent - + tags: + - remote_file_exists diff --git a/tests/ansible/integration/action/remove_tmp_path.yml b/tests/ansible/integration/action/remove_tmp_path.yml index 19d18e34..19ae22e3 100644 --- a/tests/ansible/integration/action/remove_tmp_path.yml +++ b/tests/ansible/integration/action/remove_tmp_path.yml @@ -37,3 +37,5 @@ - file: path: /tmp/remove_tmp_path_test state: absent + tags: + - remove_tmp_path diff --git a/tests/ansible/integration/action/synchronize.yml b/tests/ansible/integration/action/synchronize.yml index 64ff9735..a6cd277e 100644 --- a/tests/ansible/integration/action/synchronize.yml +++ b/tests/ansible/integration/action/synchronize.yml @@ -72,3 +72,5 @@ # - /tmp/synchronize-action-key # - /tmp/sync-test # - /tmp/sync-test.out + tags: + - synchronize diff --git a/tests/ansible/integration/action/transfer_data.yml b/tests/ansible/integration/action/transfer_data.yml index 0f56672c..e0f42d0e 100644 --- a/tests/ansible/integration/action/transfer_data.yml +++ b/tests/ansible/integration/action/transfer_data.yml @@ -46,3 +46,5 @@ - file: path: /tmp/transfer-data state: absent + tags: + - transfer_data diff --git a/tests/ansible/integration/all.yml b/tests/ansible/integration/all.yml index 8c059fc4..6bd5059a 100644 --- a/tests/ansible/integration/all.yml +++ b/tests/ansible/integration/all.yml @@ -4,20 +4,38 @@ # - include: action/all.yml + tags: action - include: async/all.yml + tags: async - include: become/all.yml + tags: become - include: connection/all.yml + tags: connection - include: connection_delegation/all.yml + tags: connection_delegation - include: connection_loader/all.yml + tags: connection_loader - include: context_service/all.yml + tags: context_service - include: glibc_caches/all.yml + tags: glibc_caches - include: interpreter_discovery/all.yml + tags: interpreter_discovery - include: local/all.yml + tags: local - include: module_utils/all.yml + tags: module_utils - include: playbook_semantics/all.yml + tags: playbook_semantics - include: process/all.yml + tags: process - include: runner/all.yml + tags: runner - include: ssh/all.yml + tags: ssh - include: strategy/all.yml + tags: strategy - include: stub_connections/all.yml + tags: stub_connections - include: transport_config/all.yml + tags: transport_config diff --git a/tests/ansible/integration/async/multiple_items_loop.yml b/tests/ansible/integration/async/multiple_items_loop.yml index 05db9652..24d43083 100644 --- a/tests/ansible/integration/async/multiple_items_loop.yml +++ b/tests/ansible/integration/async/multiple_items_loop.yml @@ -35,3 +35,5 @@ - out.results[1].rc == 0 - out.results[1].delta > '0:00:05' fail_msg: out={{out}} + tags: + - multiple_items_loop diff --git a/tests/ansible/integration/async/result_binary_producing_json.yml b/tests/ansible/integration/async/result_binary_producing_json.yml index 427fa58b..b05b24bf 100644 --- a/tests/ansible/integration/async/result_binary_producing_json.yml +++ b/tests/ansible/integration/async/result_binary_producing_json.yml @@ -55,3 +55,5 @@ fail_msg: async_out={{async_out}} vars: async_out: "{{result.content|b64decode|from_json}}" + tags: + - result_binary_producing_json diff --git a/tests/ansible/integration/async/result_binary_producing_junk.yml b/tests/ansible/integration/async/result_binary_producing_junk.yml index 25ad65cf..afdf0c2f 100644 --- a/tests/ansible/integration/async/result_binary_producing_junk.yml +++ b/tests/ansible/integration/async/result_binary_producing_junk.yml @@ -42,3 +42,5 @@ fail_msg: async_out={{async_out}} vars: async_out: "{{result.content|b64decode|from_json}}" + tags: + - result_binary_producing_junk diff --git a/tests/ansible/integration/async/result_shell_echo_hi.yml b/tests/ansible/integration/async/result_shell_echo_hi.yml index 047913e5..d7905e2e 100644 --- a/tests/ansible/integration/async/result_shell_echo_hi.yml +++ b/tests/ansible/integration/async/result_shell_echo_hi.yml @@ -46,3 +46,5 @@ when: ansible_version.full > '2.4' vars: async_out: "{{result.content|b64decode|from_json}}" + tags: + - result_shell_echo_hi diff --git a/tests/ansible/integration/async/runner_new_process.yml b/tests/ansible/integration/async/runner_new_process.yml index 1644364f..fbc7261f 100644 --- a/tests/ansible/integration/async/runner_new_process.yml +++ b/tests/ansible/integration/async/runner_new_process.yml @@ -55,3 +55,5 @@ - async_result1.pid != async_result2.pid fail_msg: async_result1={{async_result1}} async_result2={{async_result2}} when: is_mitogen + tags: + - runner_new_process diff --git a/tests/ansible/integration/async/runner_one_job.yml b/tests/ansible/integration/async/runner_one_job.yml index b8a7a564..cf33ae56 100644 --- a/tests/ansible/integration/async/runner_one_job.yml +++ b/tests/ansible/integration/async/runner_one_job.yml @@ -65,3 +65,5 @@ - result1.failed == False fail_msg: result1={{result1}} when: ansible_version.full is version('2.4', '>') + tags: + - runner_one_job diff --git a/tests/ansible/integration/async/runner_timeout_then_polling.yml b/tests/ansible/integration/async/runner_timeout_then_polling.yml index 0847a95f..6fc46ba7 100644 --- a/tests/ansible/integration/async/runner_timeout_then_polling.yml +++ b/tests/ansible/integration/async/runner_timeout_then_polling.yml @@ -33,3 +33,5 @@ - result.msg == "Job reached maximum time limit of 1 seconds." fail_msg: result={{result}} when: is_mitogen + tags: + - runner_timeout_then_polling diff --git a/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml b/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml index fd5292d1..af102f19 100644 --- a/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml +++ b/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml @@ -63,3 +63,5 @@ - result2.stdout == 'im_alive' fail_msg: result2={{result2}} when: ansible_version.full > '2.8' # ansible#51393 + tags: + - runner_two_simultaneous_jobs diff --git a/tests/ansible/integration/async/runner_with_polling_and_timeout.yml b/tests/ansible/integration/async/runner_with_polling_and_timeout.yml index c7d9338e..a5cbabef 100644 --- a/tests/ansible/integration/async/runner_with_polling_and_timeout.yml +++ b/tests/ansible/integration/async/runner_with_polling_and_timeout.yml @@ -23,4 +23,5 @@ job1.msg == "async task did not complete within the requested time - 1s" or job1.msg == "Job reached maximum time limit of 1 seconds." fail_msg: job1={{job1}} - + tags: + - runner_with_polling_and_timeout diff --git a/tests/ansible/integration/become/su_password.yml b/tests/ansible/integration/become/su_password.yml index 9e1d0cf4..7bd6db5a 100644 --- a/tests/ansible/integration/become/su_password.yml +++ b/tests/ansible/integration/become/su_password.yml @@ -59,3 +59,6 @@ - out.stdout == 'mitogen__user1' fail_msg: out={{out}} when: is_mitogen + tags: + - su + - su_password diff --git a/tests/ansible/integration/become/sudo_flags_failure.yml b/tests/ansible/integration/become/sudo_flags_failure.yml index c66db6e3..971890dd 100644 --- a/tests/ansible/integration/become/sudo_flags_failure.yml +++ b/tests/ansible/integration/become/sudo_flags_failure.yml @@ -22,3 +22,6 @@ ("sudo: unrecognized option `--derps'" in out.module_stdout) or ("sudo: unrecognized option '--derps'" in out.module_stderr) fail_msg: out={{out}} + tags: + - sudo + - sudo_flags_failure diff --git a/tests/ansible/integration/become/sudo_nonexistent.yml b/tests/ansible/integration/become/sudo_nonexistent.yml index 0f1de8ba..d0e43214 100644 --- a/tests/ansible/integration/become/sudo_nonexistent.yml +++ b/tests/ansible/integration/become/sudo_nonexistent.yml @@ -31,3 +31,6 @@ - ansible_facts.distribution not in ["MacOSX"] or ansible_version.full is version("2.11", ">=", strict=True) or is_mitogen + tags: + - sudo + - sudo_nonexistent diff --git a/tests/ansible/integration/become/sudo_nopassword.yml b/tests/ansible/integration/become/sudo_nopassword.yml index 6b074667..110c95b4 100644 --- a/tests/ansible/integration/become/sudo_nopassword.yml +++ b/tests/ansible/integration/become/sudo_nopassword.yml @@ -1,6 +1,6 @@ # Verify passwordless sudo behaviour in various cases. -- name: integration/become/sudo_basic.yml +- name: integration/become/sudo_nopassword.yml hosts: test-targets any_errors_fatal: true tasks: @@ -24,3 +24,6 @@ that: - out.stdout == 'root' fail_msg: out={{out}} + tags: + - sudo + - sudo_nopassword diff --git a/tests/ansible/integration/become/sudo_password.yml b/tests/ansible/integration/become/sudo_password.yml index d2aa1d48..a0a1dec9 100644 --- a/tests/ansible/integration/become/sudo_password.yml +++ b/tests/ansible/integration/become/sudo_password.yml @@ -70,3 +70,6 @@ # - assert: # that: # - out.stdout == 'mitogen__pw_required' + tags: + - sudo + - sudo_password diff --git a/tests/ansible/integration/become/sudo_requiretty.yml b/tests/ansible/integration/become/sudo_requiretty.yml index dd62d9a0..0bdfaa26 100644 --- a/tests/ansible/integration/become/sudo_requiretty.yml +++ b/tests/ansible/integration/become/sudo_requiretty.yml @@ -35,3 +35,6 @@ # that: # - out.stdout == 'mitogen__require_tty_pw_required' # when: is_mitogen + tags: + - sudo + - sudo_requiretty diff --git a/tests/ansible/integration/connection/become_same_user.yml b/tests/ansible/integration/connection/become_same_user.yml index 7e5e5244..9f720e5c 100644 --- a/tests/ansible/integration/connection/become_same_user.yml +++ b/tests/ansible/integration/connection/become_same_user.yml @@ -39,3 +39,5 @@ - out.result|length == 2 # no sudo fail_msg: out={{out}} when: is_mitogen + tags: + - become_same_user diff --git a/tests/ansible/integration/connection/disconnect_during_module.yml b/tests/ansible/integration/connection/disconnect_during_module.yml index 723f61fc..1c7b544a 100644 --- a/tests/ansible/integration/connection/disconnect_during_module.yml +++ b/tests/ansible/integration/connection/disconnect_during_module.yml @@ -26,3 +26,6 @@ - out.rc == 4 - "'Mitogen was disconnected from the remote environment while a call was in-progress.' in out.stdout" fail_msg: out={{out}} + tags: + - disconnect + - disconnect_during_module diff --git a/tests/ansible/integration/connection/disconnect_resets_connection.yml b/tests/ansible/integration/connection/disconnect_resets_connection.yml index 5f02a8d5..3a6f712a 100644 --- a/tests/ansible/integration/connection/disconnect_resets_connection.yml +++ b/tests/ansible/integration/connection/disconnect_resets_connection.yml @@ -45,3 +45,6 @@ except AnsibleConnectionFailure: e = sys.exc_info()[1] assert str(e).startswith('Mitogen was disconnected') + tags: + - disconnect + - disconnect_resets_connection diff --git a/tests/ansible/integration/connection/exec_command.yml b/tests/ansible/integration/connection/exec_command.yml index a0dd71f7..125def1b 100644 --- a/tests/ansible/integration/connection/exec_command.yml +++ b/tests/ansible/integration/connection/exec_command.yml @@ -18,3 +18,5 @@ - out.result[1].decode() == "hello, world\r\n" - out.result[2].decode().startswith("Shared connection to ") fail_msg: out={{out}} + tags: + - exec_command diff --git a/tests/ansible/integration/connection/home_dir.yml b/tests/ansible/integration/connection/home_dir.yml index 10154450..1dbaa5d3 100644 --- a/tests/ansible/integration/connection/home_dir.yml +++ b/tests/ansible/integration/connection/home_dir.yml @@ -37,3 +37,5 @@ "homedir from facts": "{{root_facts.ansible_facts.ansible_user_dir}}" } when: is_mitogen + tags: + - home_dir diff --git a/tests/ansible/integration/connection/put_large_file.yml b/tests/ansible/integration/connection/put_large_file.yml index 392731df..90a13999 100644 --- a/tests/ansible/integration/connection/put_large_file.yml +++ b/tests/ansible/integration/connection/put_large_file.yml @@ -10,3 +10,6 @@ file_size: 512 tasks: - include: _put_file.yml + tags: + - put_file + - put_large_file diff --git a/tests/ansible/integration/connection/put_small_file.yml b/tests/ansible/integration/connection/put_small_file.yml index d9423f75..49be87a9 100644 --- a/tests/ansible/integration/connection/put_small_file.yml +++ b/tests/ansible/integration/connection/put_small_file.yml @@ -10,3 +10,6 @@ file_size: 123 tasks: - include: _put_file.yml + tags: + - put_file + - put_small_file diff --git a/tests/ansible/integration/connection/reset.yml b/tests/ansible/integration/connection/reset.yml index 431f795b..ccad928e 100644 --- a/tests/ansible/integration/connection/reset.yml +++ b/tests/ansible/integration/connection/reset.yml @@ -44,3 +44,5 @@ # sudo PID has changed. - out_become.ppid != out_become2.ppid fail_msg: out={{out}} out2={{out2}} out_become={{out_become}} out_become2={{out_become2}} + tags: + - reset diff --git a/tests/ansible/integration/connection/reset_become.yml b/tests/ansible/integration/connection/reset_become.yml index 2b4161f2..fe29dfed 100644 --- a/tests/ansible/integration/connection/reset_become.yml +++ b/tests/ansible/integration/connection/reset_become.yml @@ -49,3 +49,5 @@ that: - login_acct.pid != new_login_acct.pid fail_msg: login_acct={{login_acct}} new_login_acct={{new_login_acct}} + tags: + - reset_become diff --git a/tests/ansible/integration/connection_delegation/delegate_to_template.yml b/tests/ansible/integration/connection_delegation/delegate_to_template.yml index bfde1265..8e048fa4 100644 --- a/tests/ansible/integration/connection_delegation/delegate_to_template.yml +++ b/tests/ansible/integration/connection_delegation/delegate_to_template.yml @@ -90,3 +90,5 @@ 'method': 'ssh', } ] + tags: + - delegate_to_template diff --git a/tests/ansible/integration/connection_delegation/local_action.yml b/tests/ansible/integration/connection_delegation/local_action.yml index 05fc3db9..1c9a25ac 100644 --- a/tests/ansible/integration/connection_delegation/local_action.yml +++ b/tests/ansible/integration/connection_delegation/local_action.yml @@ -33,3 +33,5 @@ 'method': 'sudo', } ] + tags: + - local_action diff --git a/tests/ansible/integration/connection_delegation/osa_container_standalone.yml b/tests/ansible/integration/connection_delegation/osa_container_standalone.yml index cf5eceaa..249ab31a 100644 --- a/tests/ansible/integration/connection_delegation/osa_container_standalone.yml +++ b/tests/ansible/integration/connection_delegation/osa_container_standalone.yml @@ -27,3 +27,6 @@ 'method': 'setns', }, ] + tags: + - osa + - osa_container_standalone diff --git a/tests/ansible/integration/connection_delegation/osa_delegate_to_self.yml b/tests/ansible/integration/connection_delegation/osa_delegate_to_self.yml index 4a1fa681..4598e989 100644 --- a/tests/ansible/integration/connection_delegation/osa_delegate_to_self.yml +++ b/tests/ansible/integration/connection_delegation/osa_delegate_to_self.yml @@ -30,3 +30,6 @@ 'method': 'setns', }, ] + tags: + - osa + - osa_delegate_to_self diff --git a/tests/ansible/integration/connection_delegation/stack_construction.yml b/tests/ansible/integration/connection_delegation/stack_construction.yml index ed298599..ebf0f54f 100644 --- a/tests/ansible/integration/connection_delegation/stack_construction.yml +++ b/tests/ansible/integration/connection_delegation/stack_construction.yml @@ -25,6 +25,8 @@ # used later for local_action test. - local_action: custom_python_detect_environment register: local_env + tags: + - stack_construction - hosts: cd-normal @@ -50,6 +52,8 @@ "method": "doas", } ] + tags: + - stack_construction - hosts: cd-normal @@ -94,6 +98,8 @@ 'method': 'ssh', }, ] + tags: + - stack_construction - hosts: cd-alias @@ -137,6 +143,8 @@ 'method': 'ssh', }, ] + tags: + - stack_construction - hosts: cd-normal-normal @@ -191,6 +199,8 @@ 'method': 'ssh', }, ] + tags: + - stack_construction - hosts: cd-normal-alias @@ -264,6 +274,8 @@ 'method': 'ssh', }, ] + tags: + - stack_construction - hosts: cd-newuser-normal-normal @@ -318,6 +330,8 @@ 'method': 'ssh', }, ] + tags: + - stack_construction - hosts: cd-newuser-normal-normal @@ -362,6 +376,8 @@ 'method': 'ssh', }, ] + tags: + - stack_construction - hosts: cd-newuser-normal-normal @@ -381,6 +397,8 @@ 'method': 'local', }, ] + tags: + - stack_construction - hosts: cd-newuser-doas-normal @@ -416,3 +434,5 @@ 'method': 'doas', }, ] + tags: + - stack_construction diff --git a/tests/ansible/integration/connection_loader/local_blemished.yml b/tests/ansible/integration/connection_loader/local_blemished.yml index 1592f973..85224dbf 100644 --- a/tests/ansible/integration/connection_loader/local_blemished.yml +++ b/tests/ansible/integration/connection_loader/local_blemished.yml @@ -13,3 +13,6 @@ - assert: that: (not not out.mitogen_loaded) == (not not is_mitogen) fail_msg: out={{out}} + tags: + - local + - local_blemished diff --git a/tests/ansible/integration/connection_loader/paramiko_unblemished.yml b/tests/ansible/integration/connection_loader/paramiko_unblemished.yml index db1c8bd7..1bc5e2f6 100644 --- a/tests/ansible/integration/connection_loader/paramiko_unblemished.yml +++ b/tests/ansible/integration/connection_loader/paramiko_unblemished.yml @@ -17,3 +17,6 @@ that: not out.mitogen_loaded fail_msg: out={{out}} when: False + tags: + - paramiko + - paramiko_unblemished diff --git a/tests/ansible/integration/connection_loader/ssh_blemished.yml b/tests/ansible/integration/connection_loader/ssh_blemished.yml index b97fe1ed..58d35cee 100644 --- a/tests/ansible/integration/connection_loader/ssh_blemished.yml +++ b/tests/ansible/integration/connection_loader/ssh_blemished.yml @@ -13,3 +13,6 @@ - assert: that: (not not out.mitogen_loaded) == (not not is_mitogen) fail_msg: out={{out}} + tags: + - ssh + - ssh_blemished diff --git a/tests/ansible/integration/context_service/disconnect_cleanup.yml b/tests/ansible/integration/context_service/disconnect_cleanup.yml index d7345932..4f846535 100644 --- a/tests/ansible/integration/context_service/disconnect_cleanup.yml +++ b/tests/ansible/integration/context_service/disconnect_cleanup.yml @@ -48,3 +48,5 @@ # - assert: # that: out.dump|length == play_hosts|length # just the ssh account + tags: + - disconnect_cleanup diff --git a/tests/ansible/integration/context_service/lru_one_target.yml b/tests/ansible/integration/context_service/lru_one_target.yml index 4ab5e134..2d6dc6cf 100644 --- a/tests/ansible/integration/context_service/lru_one_target.yml +++ b/tests/ansible/integration/context_service/lru_one_target.yml @@ -40,3 +40,5 @@ # that: # - first_run.results[-1].pid != second_run.results[-1].pid # when: is_mitogen + tags: + - lru_one_target diff --git a/tests/ansible/integration/context_service/reconnection.yml b/tests/ansible/integration/context_service/reconnection.yml index c5cec967..2d7dbacf 100644 --- a/tests/ansible/integration/context_service/reconnection.yml +++ b/tests/ansible/integration/context_service/reconnection.yml @@ -32,3 +32,5 @@ that: - old_become_env.pid != new_become_env.pid fail_msg: old_become_env={{old_become_env}} new_become_env={{new_become_env}} + tags: + - reconnection diff --git a/tests/ansible/integration/context_service/remote_name.yml b/tests/ansible/integration/context_service/remote_name.yml index e2d9acac..cce209e4 100644 --- a/tests/ansible/integration/context_service/remote_name.yml +++ b/tests/ansible/integration/context_service/remote_name.yml @@ -30,4 +30,5 @@ that: - out.stdout is match('.*python([0-9.]+)?\(mitogen:ansible\)') fail_msg: out={{out}} - + tags: + - remote_name diff --git a/tests/ansible/integration/glibc_caches/resolv_conf.yml b/tests/ansible/integration/glibc_caches/resolv_conf.yml index 0f1ddf35..e2894e58 100644 --- a/tests/ansible/integration/glibc_caches/resolv_conf.yml +++ b/tests/ansible/integration/glibc_caches/resolv_conf.yml @@ -48,3 +48,5 @@ when: | ansible_virtualization_type == "docker" and ansible_python_version > "2.5" + tags: + - resolv_conf diff --git a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml index d5e515b4..838b2d86 100644 --- a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml +++ b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml @@ -164,3 +164,5 @@ always: - meta: clear_facts when: ansible_version.full is version_compare('2.8.0', '>=') + tags: + - ansible_2_8_tests diff --git a/tests/ansible/integration/interpreter_discovery/complex_args.yml b/tests/ansible/integration/interpreter_discovery/complex_args.yml index 6c53e9e5..ca35a402 100644 --- a/tests/ansible/integration/interpreter_discovery/complex_args.yml +++ b/tests/ansible/integration/interpreter_discovery/complex_args.yml @@ -54,3 +54,5 @@ environment: https_proxy: "{{ lookup('env', 'https_proxy')|default('') }}" no_proxy: "{{ lookup('env', 'no_proxy')|default('') }}" + tags: + - complex_args diff --git a/tests/ansible/integration/local/cwd_preserved.yml b/tests/ansible/integration/local/cwd_preserved.yml index 5549f156..24a34ba8 100644 --- a/tests/ansible/integration/local/cwd_preserved.yml +++ b/tests/ansible/integration/local/cwd_preserved.yml @@ -20,4 +20,5 @@ - assert: that: stat.stat.exists fail_msg: stat={{stat}} - + tags: + - cwd_prseserved diff --git a/tests/ansible/integration/local/env_preserved.yml b/tests/ansible/integration/local/env_preserved.yml index 1375391e..64794756 100644 --- a/tests/ansible/integration/local/env_preserved.yml +++ b/tests/ansible/integration/local/env_preserved.yml @@ -6,3 +6,5 @@ connection: local tasks: - shell: "env | grep EVIL_VARS_PLUGIN" + tags: + - env_preserved diff --git a/tests/ansible/integration/module_utils/adjacent_to_playbook.yml b/tests/ansible/integration/module_utils/adjacent_to_playbook.yml index f47e147f..edd65db7 100644 --- a/tests/ansible/integration/module_utils/adjacent_to_playbook.yml +++ b/tests/ansible/integration/module_utils/adjacent_to_playbook.yml @@ -14,4 +14,5 @@ - out.external1_path == "ansible/integration/module_utils/module_utils/external1.py" - out.external2_path == "ansible/lib/module_utils/external2.py" fail_msg: out={{out}} - + tags: + - adjacent_to_playbook diff --git a/tests/ansible/integration/module_utils/adjacent_to_role.yml b/tests/ansible/integration/module_utils/adjacent_to_role.yml index 3fd3b1e6..4430c2d9 100644 --- a/tests/ansible/integration/module_utils/adjacent_to_role.yml +++ b/tests/ansible/integration/module_utils/adjacent_to_role.yml @@ -6,3 +6,5 @@ any_errors_fatal: true roles: - modrole + tags: + - adjacent_to_playbook diff --git a/tests/ansible/integration/module_utils/from_config_path.yml b/tests/ansible/integration/module_utils/from_config_path.yml index df3acd9b..0fb0f3ea 100644 --- a/tests/ansible/integration/module_utils/from_config_path.yml +++ b/tests/ansible/integration/module_utils/from_config_path.yml @@ -13,4 +13,5 @@ - out.external1_path == "ansible/lib/module_utils/external1.py" - out.external2_path == "ansible/lib/module_utils/external2.py" fail_msg: out={{out}} - + tags: + - from_config_path diff --git a/tests/ansible/integration/module_utils/from_config_path_pkg.yml b/tests/ansible/integration/module_utils/from_config_path_pkg.yml index 81881aa1..3453cf29 100644 --- a/tests/ansible/integration/module_utils/from_config_path_pkg.yml +++ b/tests/ansible/integration/module_utils/from_config_path_pkg.yml @@ -12,4 +12,5 @@ that: - out.extmod_path == "ansible/lib/module_utils/externalpkg/extmod.py" fail_msg: out={{out}} - + tags: + - from_config_path diff --git a/tests/ansible/integration/module_utils/overrides_builtin.yml b/tests/ansible/integration/module_utils/overrides_builtin.yml index 635876f1..86d88312 100644 --- a/tests/ansible/integration/module_utils/overrides_builtin.yml +++ b/tests/ansible/integration/module_utils/overrides_builtin.yml @@ -4,3 +4,5 @@ any_errors_fatal: true roles: - overrides_modrole + tags: + - overrides_builtin diff --git a/tests/ansible/integration/playbook_semantics/become_flags.yml b/tests/ansible/integration/playbook_semantics/become_flags.yml index 96a283da..ac762643 100644 --- a/tests/ansible/integration/playbook_semantics/become_flags.yml +++ b/tests/ansible/integration/playbook_semantics/become_flags.yml @@ -15,6 +15,8 @@ - assert: that: "out.stdout == ''" fail_msg: out={{out}} + tags: + - become_flags - hosts: test-targets any_errors_fatal: true @@ -30,3 +32,5 @@ - assert: that: "out2.stdout == '2'" fail_msg: out={{out}} + tags: + - become_flags diff --git a/tests/ansible/integration/playbook_semantics/delegate_to.yml b/tests/ansible/integration/playbook_semantics/delegate_to.yml index 23b7168c..7536258f 100644 --- a/tests/ansible/integration/playbook_semantics/delegate_to.yml +++ b/tests/ansible/integration/playbook_semantics/delegate_to.yml @@ -94,3 +94,5 @@ become: true tags: - requires_local_sudo + tags: + - delegate_to diff --git a/tests/ansible/integration/playbook_semantics/environment.yml b/tests/ansible/integration/playbook_semantics/environment.yml index 7d6b5184..01e8ce04 100644 --- a/tests/ansible/integration/playbook_semantics/environment.yml +++ b/tests/ansible/integration/playbook_semantics/environment.yml @@ -12,3 +12,5 @@ - assert: that: "result.stdout == '123'" fail_msg: result={{result}} + tags: + - environment diff --git a/tests/ansible/integration/playbook_semantics/with_items.yml b/tests/ansible/integration/playbook_semantics/with_items.yml index 9e64c1ba..12a92bba 100644 --- a/tests/ansible/integration/playbook_semantics/with_items.yml +++ b/tests/ansible/integration/playbook_semantics/with_items.yml @@ -29,3 +29,5 @@ # - first_run.results[item|int].stdout == ("mitogen__user%d" % (item|int + 1)) # - first_run.results[item|int].stdout == second_run.results[item|int].stdout # with_sequence: start=0 end=2 + tags: + - custom_python_new_style_module diff --git a/tests/ansible/integration/process/unix_socket_cleanup.yml b/tests/ansible/integration/process/unix_socket_cleanup.yml index 11a0efe1..6aeac609 100644 --- a/tests/ansible/integration/process/unix_socket_cleanup.yml +++ b/tests/ansible/integration/process/unix_socket_cleanup.yml @@ -26,3 +26,5 @@ - assert_equal: left: socks right: socks2 + tags: + - custom_python_new_style_module diff --git a/tests/ansible/integration/runner/atexit.yml b/tests/ansible/integration/runner/atexit.yml index 25babf0d..9cab0a5d 100644 --- a/tests/ansible/integration/runner/atexit.yml +++ b/tests/ansible/integration/runner/atexit.yml @@ -30,3 +30,5 @@ that: - not out.stat.exists fail_msg: out={{out}} + tags: + - atexit diff --git a/tests/ansible/integration/runner/builtin_command_module.yml b/tests/ansible/integration/runner/builtin_command_module.yml index b0ca7e1c..b567bee6 100644 --- a/tests/ansible/integration/runner/builtin_command_module.yml +++ b/tests/ansible/integration/runner/builtin_command_module.yml @@ -17,3 +17,5 @@ out.results[0].rc == 0 and (out.results[0].stdout == ansible_nodename) fail_msg: out={{out}} + tags: + - builtin_command_module diff --git a/tests/ansible/integration/runner/crashy_new_style_module.yml b/tests/ansible/integration/runner/crashy_new_style_module.yml index 01d4a98d..77f45861 100644 --- a/tests/ansible/integration/runner/crashy_new_style_module.yml +++ b/tests/ansible/integration/runner/crashy_new_style_module.yml @@ -23,3 +23,5 @@ or (out.module_stdout is search(tb_pattern) and out.module_stderr is match("Shared connection to localhost closed.")) fail_msg: out={{out}} + tags: + - crashy_new_style_module diff --git a/tests/ansible/integration/runner/custom_bash_hashbang_argument.yml b/tests/ansible/integration/runner/custom_bash_hashbang_argument.yml index 1eb79f20..d2d2281c 100644 --- a/tests/ansible/integration/runner/custom_bash_hashbang_argument.yml +++ b/tests/ansible/integration/runner/custom_bash_hashbang_argument.yml @@ -18,3 +18,5 @@ out.results[0].msg == 'Here is my input' and out.results[0].run_via_env == "yes" fail_msg: out={{out}} + tags: + - custom_bash_hashbang_argument diff --git a/tests/ansible/integration/runner/custom_bash_old_style_module.yml b/tests/ansible/integration/runner/custom_bash_old_style_module.yml index 4a14f86e..122b8fde 100644 --- a/tests/ansible/integration/runner/custom_bash_old_style_module.yml +++ b/tests/ansible/integration/runner/custom_bash_old_style_module.yml @@ -14,3 +14,5 @@ (not out.results[0].changed) and out.results[0].msg == 'Here is my input' fail_msg: out={{out}} + tags: + - custom_bash_old_style_module diff --git a/tests/ansible/integration/runner/custom_bash_want_json_module.yml b/tests/ansible/integration/runner/custom_bash_want_json_module.yml index 5ae74a4d..b4242e9a 100644 --- a/tests/ansible/integration/runner/custom_bash_want_json_module.yml +++ b/tests/ansible/integration/runner/custom_bash_want_json_module.yml @@ -13,3 +13,5 @@ (not out.results[0].changed) and out.results[0].msg == 'Here is my input' fail_msg: out={{out}} + tags: + - custom_bash_want_json_module diff --git a/tests/ansible/integration/runner/custom_binary_producing_json.yml b/tests/ansible/integration/runner/custom_binary_producing_json.yml index 016efac9..6dfeefc3 100644 --- a/tests/ansible/integration/runner/custom_binary_producing_json.yml +++ b/tests/ansible/integration/runner/custom_binary_producing_json.yml @@ -25,3 +25,5 @@ out.results[0].changed and out.results[0].msg == 'Hello, world.' fail_msg: out={{out}} + tags: + - custom_binary_producing_json diff --git a/tests/ansible/integration/runner/custom_binary_producing_junk.yml b/tests/ansible/integration/runner/custom_binary_producing_junk.yml index d302d43c..97fc92fe 100644 --- a/tests/ansible/integration/runner/custom_binary_producing_junk.yml +++ b/tests/ansible/integration/runner/custom_binary_producing_junk.yml @@ -19,6 +19,8 @@ register: out_linux - set_fact: out={{out_linux}} when: ansible_system == "Linux" + tags: + - custom_binary_producing_junk - hosts: test-targets @@ -31,3 +33,5 @@ - out.results[0].msg.startswith('MODULE FAILURE') - out.results[0].rc == 0 fail_msg: out={{out}} + tags: + - custom_binary_producing_junk diff --git a/tests/ansible/integration/runner/custom_binary_single_null.yml b/tests/ansible/integration/runner/custom_binary_single_null.yml index 8e2331a2..353cc58d 100644 --- a/tests/ansible/integration/runner/custom_binary_single_null.yml +++ b/tests/ansible/integration/runner/custom_binary_single_null.yml @@ -6,6 +6,8 @@ with_sequence: start=1 end={{end|default(1)}} ignore_errors: true register: out + tags: + - custom_binary_single_null - hosts: test-targets any_errors_fatal: true @@ -28,7 +30,8 @@ )) or (ansible_facts.distribution == 'Ubuntu' and ansible_facts.distribution_version == '16.04') fail_msg: out={{out}} - + tags: + - custom_binary_single_null # Can't test this: Mitogen returns 126, 2.5.x returns 126, 2.4.x discarded the # return value and always returned 0. diff --git a/tests/ansible/integration/runner/custom_perl_json_args_module.yml b/tests/ansible/integration/runner/custom_perl_json_args_module.yml index 9d51e71f..6201318a 100644 --- a/tests/ansible/integration/runner/custom_perl_json_args_module.yml +++ b/tests/ansible/integration/runner/custom_perl_json_args_module.yml @@ -19,3 +19,5 @@ - (not out.changed) - (not out.results[0].changed) fail_msg: out={{out}} + tags: + - custom_perl_json_args_module diff --git a/tests/ansible/integration/runner/custom_perl_want_json_module.yml b/tests/ansible/integration/runner/custom_perl_want_json_module.yml index 57d92fd0..9c39b1b6 100644 --- a/tests/ansible/integration/runner/custom_perl_want_json_module.yml +++ b/tests/ansible/integration/runner/custom_perl_want_json_module.yml @@ -19,3 +19,5 @@ - (not out.changed) - (not out.results[0].changed) fail_msg: out={{out}} + tags: + - custom_perl_want_json_module diff --git a/tests/ansible/integration/runner/custom_python_json_args_module.yml b/tests/ansible/integration/runner/custom_python_json_args_module.yml index 5c77097e..33a03ba0 100644 --- a/tests/ansible/integration/runner/custom_python_json_args_module.yml +++ b/tests/ansible/integration/runner/custom_python_json_args_module.yml @@ -14,3 +14,5 @@ out.results[0].input[0].foo and out.results[0].msg == 'Here is my input' fail_msg: out={{out}} + tags: + - custom_python_json_args_module diff --git a/tests/ansible/integration/runner/custom_python_new_style_missing_interpreter.yml b/tests/ansible/integration/runner/custom_python_new_style_missing_interpreter.yml index 4a375ff0..1562e307 100644 --- a/tests/ansible/integration/runner/custom_python_new_style_missing_interpreter.yml +++ b/tests/ansible/integration/runner/custom_python_new_style_missing_interpreter.yml @@ -16,3 +16,5 @@ #- "out.results[0].input[0].ANSIBLE_MODULE_ARGS.foo" - "out.results[0].msg == 'Here is my input'" fail_msg: out={{out}} + tags: + - custom_python_new_style_module diff --git a/tests/ansible/integration/runner/custom_python_new_style_module.yml b/tests/ansible/integration/runner/custom_python_new_style_module.yml index 3992f4b1..b22fdc14 100644 --- a/tests/ansible/integration/runner/custom_python_new_style_module.yml +++ b/tests/ansible/integration/runner/custom_python_new_style_module.yml @@ -28,3 +28,5 @@ that: - out.argv_types_correct fail_msg: out={{out}} + tags: + - custom_python_new_style_module diff --git a/tests/ansible/integration/runner/custom_python_prehistoric_module.yml b/tests/ansible/integration/runner/custom_python_prehistoric_module.yml index 19a8a9de..4ddec8c5 100644 --- a/tests/ansible/integration/runner/custom_python_prehistoric_module.yml +++ b/tests/ansible/integration/runner/custom_python_prehistoric_module.yml @@ -10,3 +10,5 @@ - assert: that: out.ok fail_msg: out={{out}} + tags: + - custom_python_prehistoric_module diff --git a/tests/ansible/integration/runner/custom_python_want_json_module.yml b/tests/ansible/integration/runner/custom_python_want_json_module.yml index dd5a5c1c..d704ee11 100644 --- a/tests/ansible/integration/runner/custom_python_want_json_module.yml +++ b/tests/ansible/integration/runner/custom_python_want_json_module.yml @@ -14,3 +14,5 @@ out.results[0].input[0].foo and out.results[0].msg == 'Here is my input' fail_msg: out={{out}} + tags: + - custom_python_want_json_module diff --git a/tests/ansible/integration/runner/custom_script_interpreter.yml b/tests/ansible/integration/runner/custom_script_interpreter.yml index f496cff0..03ea6718 100644 --- a/tests/ansible/integration/runner/custom_script_interpreter.yml +++ b/tests/ansible/integration/runner/custom_script_interpreter.yml @@ -16,4 +16,5 @@ (not out.results[0].changed) and out.results[0].msg == 'Here is my input' fail_msg: out={{out}} - + tags: + - custom_script_interpreter diff --git a/tests/ansible/integration/runner/environment_isolation.yml b/tests/ansible/integration/runner/environment_isolation.yml index eee31d6e..90110d01 100644 --- a/tests/ansible/integration/runner/environment_isolation.yml +++ b/tests/ansible/integration/runner/environment_isolation.yml @@ -51,4 +51,5 @@ - assert: that: not out.env.evil_key is defined fail_msg: out={{out}} - + tags: + - environment_isolation diff --git a/tests/ansible/integration/runner/etc_environment.yml b/tests/ansible/integration/runner/etc_environment.yml index df15bbdb..3a44c753 100644 --- a/tests/ansible/integration/runner/etc_environment.yml +++ b/tests/ansible/integration/runner/etc_environment.yml @@ -13,3 +13,5 @@ - include_tasks: _etc_environment_global.yml # Don't destroy laptops. when: ansible_virtualization_type == "docker" + tags: + - etc_environment diff --git a/tests/ansible/integration/runner/forking_active.yml b/tests/ansible/integration/runner/forking_active.yml index ebae849b..6a0e322d 100644 --- a/tests/ansible/integration/runner/forking_active.yml +++ b/tests/ansible/integration/runner/forking_active.yml @@ -30,3 +30,5 @@ fail_msg: fork_proc1={{fork_proc1}} sync_proc1={{sync_proc1}} fork_proc2={{fork_proc2}} when: is_mitogen + tags: + - forking_active diff --git a/tests/ansible/integration/runner/forking_correct_parent.yml b/tests/ansible/integration/runner/forking_correct_parent.yml index 59cf48e7..7fe54e7b 100644 --- a/tests/ansible/integration/runner/forking_correct_parent.yml +++ b/tests/ansible/integration/runner/forking_correct_parent.yml @@ -44,3 +44,6 @@ that: fork_proc.ppid == regular_proc.pid fail_msg: fork_proc={{fork_proc}} regular_proc={{regular_proc}} when: is_mitogen and not forkmode.uses_fork + + tags: + - forking_correct_parent diff --git a/tests/ansible/integration/runner/forking_inactive.yml b/tests/ansible/integration/runner/forking_inactive.yml index 05ec30ef..37282f82 100644 --- a/tests/ansible/integration/runner/forking_inactive.yml +++ b/tests/ansible/integration/runner/forking_inactive.yml @@ -21,4 +21,5 @@ fail_msg: sync_proc1={{sync_proc1}} sync_proc2={{sync_proc2}} when: is_mitogen - + tags: + - forking_inactive diff --git a/tests/ansible/integration/runner/missing_module.yml b/tests/ansible/integration/runner/missing_module.yml index f515b574..676012d9 100644 --- a/tests/ansible/integration/runner/missing_module.yml +++ b/tests/ansible/integration/runner/missing_module.yml @@ -18,3 +18,6 @@ that: | 'The module missing_module was not found in configured module paths' in out.stdout fail_msg: out={{out}} + tags: + - local + - missing_module diff --git a/tests/ansible/integration/ssh/config.yml b/tests/ansible/integration/ssh/config.yml index 9cd024e7..4e6748b1 100644 --- a/tests/ansible/integration/ssh/config.yml +++ b/tests/ansible/integration/ssh/config.yml @@ -18,3 +18,5 @@ lookup('env', 'HOME') + '/fakekey' ) fail_msg: out={{out}} + tags: + - config diff --git a/tests/ansible/integration/ssh/timeouts.yml b/tests/ansible/integration/ssh/timeouts.yml index 90be6c94..d697905a 100644 --- a/tests/ansible/integration/ssh/timeouts.yml +++ b/tests/ansible/integration/ssh/timeouts.yml @@ -26,3 +26,5 @@ '"msg": "Connection timed out."' in out.stdout fail_msg: out={{out}} when: is_mitogen + tags: + - timeouts diff --git a/tests/ansible/integration/strategy/_mixed_mitogen_vanilla.yml b/tests/ansible/integration/strategy/_mixed_mitogen_vanilla.yml index 3dfec756..b2ae7641 100644 --- a/tests/ansible/integration/strategy/_mixed_mitogen_vanilla.yml +++ b/tests/ansible/integration/strategy/_mixed_mitogen_vanilla.yml @@ -17,7 +17,8 @@ - assert: that: strategy == 'ansible.plugins.strategy.mitogen_linear.StrategyModule' fail_msg: strategy={{strategy}} - + tags: + - mitogen_linear - name: integration/strategy/_mixed_mitogen_vanilla.yml (linear) hosts: test-targets[0] @@ -34,7 +35,8 @@ - assert: that: strategy == 'ansible.plugins.strategy.linear.StrategyModule' fail_msg: strategy={{strategy}} - + tags: + - linear - name: integration/strategy/_mixed_mitogen_vanilla.yml (mitogen_linear) hosts: test-targets[0] @@ -51,3 +53,5 @@ - assert: that: strategy == 'ansible.plugins.strategy.mitogen_linear.StrategyModule' fail_msg: strategy={{strategy}} + tags: + - mitogen_linear diff --git a/tests/ansible/integration/strategy/_mixed_vanilla_mitogen.yml b/tests/ansible/integration/strategy/_mixed_vanilla_mitogen.yml index 6381f114..e073d11a 100644 --- a/tests/ansible/integration/strategy/_mixed_vanilla_mitogen.yml +++ b/tests/ansible/integration/strategy/_mixed_vanilla_mitogen.yml @@ -16,6 +16,8 @@ - assert: that: strategy == 'ansible.plugins.strategy.linear.StrategyModule' fail_msg: strategy={{strategy}} + tags: + - linear - name: integration/strategy/_mixed_vanilla_mitogen.yml (mitogen_linear) hosts: test-targets[0] @@ -32,7 +34,8 @@ - assert: that: strategy == 'ansible.plugins.strategy.mitogen_linear.StrategyModule' fail_msg: strategy={{strategy}} - + tags: + - mitogen_linear - name: integration/strategy/_mixed_vanilla_mitogen.yml (linear) hosts: test-targets[0] @@ -49,3 +52,5 @@ - assert: that: strategy == 'ansible.plugins.strategy.linear.StrategyModule' fail_msg: strategy={{strategy}} + tags: + - linear diff --git a/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml b/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml index 206f80bd..0f462fea 100644 --- a/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml +++ b/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml @@ -22,3 +22,5 @@ args: chdir: ../.. register: out + tags: + - mixed_vanilla_mitogen diff --git a/tests/ansible/integration/stub_connections/kubectl.yml b/tests/ansible/integration/stub_connections/kubectl.yml index 92ed1a89..e4b881f8 100644 --- a/tests/ansible/integration/stub_connections/kubectl.yml +++ b/tests/ansible/integration/stub_connections/kubectl.yml @@ -21,3 +21,5 @@ that: - out.env.THIS_IS_STUB_KUBECTL == '1' fail_msg: out={{out}} + tags: + - kubectl diff --git a/tests/ansible/integration/stub_connections/lxc.yml b/tests/ansible/integration/stub_connections/lxc.yml index c09f2df2..ec79cdac 100644 --- a/tests/ansible/integration/stub_connections/lxc.yml +++ b/tests/ansible/integration/stub_connections/lxc.yml @@ -18,3 +18,5 @@ that: - out.env.THIS_IS_STUB_LXC_ATTACH == '1' fail_msg: out={{out}} + tags: + - lxc diff --git a/tests/ansible/integration/stub_connections/lxd.yml b/tests/ansible/integration/stub_connections/lxd.yml index de7d8766..cb03232f 100644 --- a/tests/ansible/integration/stub_connections/lxd.yml +++ b/tests/ansible/integration/stub_connections/lxd.yml @@ -18,3 +18,5 @@ that: - out.env.THIS_IS_STUB_LXC == '1' fail_msg: out={{out}} + tags: + - lxd diff --git a/tests/ansible/integration/stub_connections/mitogen_doas.yml b/tests/ansible/integration/stub_connections/mitogen_doas.yml index 4ced049d..5e545935 100644 --- a/tests/ansible/integration/stub_connections/mitogen_doas.yml +++ b/tests/ansible/integration/stub_connections/mitogen_doas.yml @@ -21,3 +21,5 @@ - out.env.THIS_IS_STUB_DOAS == '1' - (out.env.ORIGINAL_ARGV|from_json)[1:3] == ['-u', 'someuser'] fail_msg: out={{out}} + tags: + - mitogen_doas diff --git a/tests/ansible/integration/stub_connections/mitogen_sudo.yml b/tests/ansible/integration/stub_connections/mitogen_sudo.yml index 2e1b0103..36f69814 100644 --- a/tests/ansible/integration/stub_connections/mitogen_sudo.yml +++ b/tests/ansible/integration/stub_connections/mitogen_sudo.yml @@ -23,3 +23,5 @@ - assert_equal: left: (out.env.ORIGINAL_ARGV|from_json)[1:9] right: ['-u', 'root', '-H', '-r', 'somerole', '-t', 'sometype', '--'] + tags: + - mitogen_sudo diff --git a/tests/ansible/integration/stub_connections/setns_lxc.yml b/tests/ansible/integration/stub_connections/setns_lxc.yml index fcea3de2..44717504 100644 --- a/tests/ansible/integration/stub_connections/setns_lxc.yml +++ b/tests/ansible/integration/stub_connections/setns_lxc.yml @@ -32,3 +32,5 @@ - assert: that: result.rc == 0 fail_msg: result={{result}} + tags: + - stns_lxc diff --git a/tests/ansible/integration/stub_connections/setns_lxd.yml b/tests/ansible/integration/stub_connections/setns_lxd.yml index 61018382..841f7805 100644 --- a/tests/ansible/integration/stub_connections/setns_lxd.yml +++ b/tests/ansible/integration/stub_connections/setns_lxd.yml @@ -32,3 +32,5 @@ - assert: that: result.rc == 0 fail_msg: result={{result}} + tags: + - sens_lxd diff --git a/tests/ansible/integration/transport/all.yml b/tests/ansible/integration/transport/all.yml index 534534db..623ee00c 100644 --- a/tests/ansible/integration/transport/all.yml +++ b/tests/ansible/integration/transport/all.yml @@ -1,2 +1,4 @@ - include: kubectl.yml + tags: + - kubectl diff --git a/tests/ansible/regression/all.yml b/tests/ansible/regression/all.yml index 0d5e43cd..06ffdf61 100644 --- a/tests/ansible/regression/all.yml +++ b/tests/ansible/regression/all.yml @@ -1,15 +1,30 @@ - include: issue_109__target_has_old_ansible_installed.yml + tags: regression - include: issue_113__duplicate_module_imports.yml + tags: regression - include: issue_118__script_not_marked_exec.yml + tags: regression - include: issue_122__environment_difference.yml + tags: regression - include: issue_140__thread_pileup.yml + tags: regression - include: issue_152__local_action_wrong_interpreter.yml + tags: regression - include: issue_152__virtualenv_python_fails.yml + tags: regression - include: issue_154__module_state_leaks.yml + tags: regression - include: issue_177__copy_module_failing.yml + tags: regression - include: issue_332_ansiblemoduleerror_first_occurrence.yml + tags: regression - include: issue_558_unarchive_failed.yml + tags: regression - include: issue_590__sys_modules_crap.yml + tags: regression - include: issue_591__setuptools_cwd_crash.yml + tags: regression - include: issue_615__streaming_transfer.yml + tags: regression - include: issue_655__wait_for_connection_error.yml + tags: regression diff --git a/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml b/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml index 5c00734f..fdc61c05 100644 --- a/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml +++ b/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml @@ -30,3 +30,5 @@ # Run some new-style modules that 'from ansible.module_utils...' - stat: path: / + tags: + - issue_109 diff --git a/tests/ansible/regression/issue_113__duplicate_module_imports.yml b/tests/ansible/regression/issue_113__duplicate_module_imports.yml index 7c556588..b479e025 100644 --- a/tests/ansible/regression/issue_113__duplicate_module_imports.yml +++ b/tests/ansible/regression/issue_113__duplicate_module_imports.yml @@ -22,4 +22,6 @@ - out.status == -1 - out.url == 'http://127.0.0.1:14321/post' fail_msg: out={{out}} + tags: + - issue_113 diff --git a/tests/ansible/regression/issue_118__script_not_marked_exec.yml b/tests/ansible/regression/issue_118__script_not_marked_exec.yml index 724644f9..e02c49d3 100644 --- a/tests/ansible/regression/issue_118__script_not_marked_exec.yml +++ b/tests/ansible/regression/issue_118__script_not_marked_exec.yml @@ -6,3 +6,5 @@ tasks: - script: scripts/issue_118_saytrue + tags: + - issue_118 diff --git a/tests/ansible/regression/issue_122__environment_difference.yml b/tests/ansible/regression/issue_122__environment_difference.yml index b020cc5d..273a49ae 100644 --- a/tests/ansible/regression/issue_122__environment_difference.yml +++ b/tests/ansible/regression/issue_122__environment_difference.yml @@ -12,3 +12,5 @@ - script: scripts/print_env.py register: env - debug: msg={{env}} + tags: + - issue_122 diff --git a/tests/ansible/regression/issue_140__thread_pileup.yml b/tests/ansible/regression/issue_140__thread_pileup.yml index 78d5c7b1..e6ea83ce 100644 --- a/tests/ansible/regression/issue_140__thread_pileup.yml +++ b/tests/ansible/regression/issue_140__thread_pileup.yml @@ -34,3 +34,4 @@ tags: - resource_intensive + - issue_140 diff --git a/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml b/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml index 104e27cc..4da6f544 100644 --- a/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml +++ b/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml @@ -30,3 +30,5 @@ - file: path: /tmp/issue_152_interpreter.sh state: absent + tags: + - issue_152 diff --git a/tests/ansible/regression/issue_152__virtualenv_python_fails.yml b/tests/ansible/regression/issue_152__virtualenv_python_fails.yml index c04f0b80..d3bda041 100644 --- a/tests/ansible/regression/issue_152__virtualenv_python_fails.yml +++ b/tests/ansible/regression/issue_152__virtualenv_python_fails.yml @@ -31,3 +31,5 @@ path: /tmp/issue_152_virtualenv state: absent when: lout.python_version > '2.6' + tags: + - issue_152 diff --git a/tests/ansible/regression/issue_154__module_state_leaks.yml b/tests/ansible/regression/issue_154__module_state_leaks.yml index b25b9030..59b970d9 100644 --- a/tests/ansible/regression/issue_154__module_state_leaks.yml +++ b/tests/ansible/regression/issue_154__module_state_leaks.yml @@ -17,3 +17,5 @@ - out.results[item|int].leak2 == ["David"] fail_msg: out={{out}} with_sequence: start=0 end=3 + tags: + - issue_154 diff --git a/tests/ansible/regression/issue_177__copy_module_failing.yml b/tests/ansible/regression/issue_177__copy_module_failing.yml index 593a0ae7..7da39962 100644 --- a/tests/ansible/regression/issue_177__copy_module_failing.yml +++ b/tests/ansible/regression/issue_177__copy_module_failing.yml @@ -17,3 +17,5 @@ with_items: - passwd - hosts + tags: + - issue_177 diff --git a/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml b/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml index 4138b544..2433e566 100644 --- a/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml +++ b/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml @@ -12,3 +12,5 @@ that: - out.msg == 'file (/usr/bin/does-not-exist) is absent, cannot continue' fail_msg: out={{out}} + tags: + - issue_332 diff --git a/tests/ansible/regression/issue_558_unarchive_failed.yml b/tests/ansible/regression/issue_558_unarchive_failed.yml index c6b1c9f6..23e9caad 100644 --- a/tests/ansible/regression/issue_558_unarchive_failed.yml +++ b/tests/ansible/regression/issue_558_unarchive_failed.yml @@ -11,3 +11,5 @@ dest: /tmp/foo # garbage doesn't work with BSD tar when: ansible_system != 'Darwin' + tags: + - issue_558 diff --git a/tests/ansible/regression/issue_590__sys_modules_crap.yml b/tests/ansible/regression/issue_590__sys_modules_crap.yml index 486b6d31..52b3ea97 100644 --- a/tests/ansible/regression/issue_590__sys_modules_crap.yml +++ b/tests/ansible/regression/issue_590__sys_modules_crap.yml @@ -11,3 +11,5 @@ that: - "'id' in out.info" fail_msg: out={{out}} + tags: + - issue_590 diff --git a/tests/ansible/regression/issue_591__setuptools_cwd_crash.yml b/tests/ansible/regression/issue_591__setuptools_cwd_crash.yml index fc73825c..02676cb5 100644 --- a/tests/ansible/regression/issue_591__setuptools_cwd_crash.yml +++ b/tests/ansible/regression/issue_591__setuptools_cwd_crash.yml @@ -22,3 +22,5 @@ script: | import os self._connection.get_chain().call(os.getcwd) + tags: + - issue_591 diff --git a/tests/ansible/regression/issue_615__streaming_transfer.yml b/tests/ansible/regression/issue_615__streaming_transfer.yml index aa7c62c4..b77aa254 100644 --- a/tests/ansible/regression/issue_615__streaming_transfer.yml +++ b/tests/ansible/regression/issue_615__streaming_transfer.yml @@ -19,3 +19,5 @@ path: /tmp/fetch-out state: absent delegate_to: localhost + tags: + - issue_615 diff --git a/tests/ansible/regression/issue_655__wait_for_connection_error.yml b/tests/ansible/regression/issue_655__wait_for_connection_error.yml index aa9472ec..307dead5 100644 --- a/tests/ansible/regression/issue_655__wait_for_connection_error.yml +++ b/tests/ansible/regression/issue_655__wait_for_connection_error.yml @@ -83,3 +83,5 @@ - name: remove test container shell: /usr/local/bin/docker stop testMitogen + tags: + - issue_655