diff --git a/changelogs/fragments/86403-fix-deb822-repository-output.yml b/changelogs/fragments/86403-fix-deb822-repository-output.yml index 8a411662255..c3a1733b796 100644 --- a/changelogs/fragments/86403-fix-deb822-repository-output.yml +++ b/changelogs/fragments/86403-fix-deb822-repository-output.yml @@ -1,2 +1,2 @@ bugfixes: - - deb822_repository - Remove ``Install-Python-Debian`` from files outputed by the ``deb822_repository`` module (https://github.com/ansible/ansible/issues/86395) + - deb822_repository - Remove ``Install-Python-Debian`` from files outputted by the ``deb822_repository`` module (https://github.com/ansible/ansible/issues/86395) diff --git a/changelogs/fragments/ctypes-crypt.yml b/changelogs/fragments/ctypes-crypt.yml index 70c9f5e403b..a85565eaf9f 100644 --- a/changelogs/fragments/ctypes-crypt.yml +++ b/changelogs/fragments/ctypes-crypt.yml @@ -1,2 +1,2 @@ minor_changes: -- password hashing - Add support back for using the ``crypt`` implmentation from the C library used to build Python, or with expanded functionality using ``libxcrypt`` +- password hashing - Add support back for using the ``crypt`` implementation from the C library used to build Python, or with expanded functionality using ``libxcrypt`` diff --git a/changelogs/fragments/dnf_install.yml b/changelogs/fragments/dnf_install.yml index 44f7c77afe8..369a8f1df8b 100644 --- a/changelogs/fragments/dnf_install.yml +++ b/changelogs/fragments/dnf_install.yml @@ -1,3 +1,3 @@ --- bugfixes: - - dnf5 - return failure message which occured while running RPM scriptlet (https://github.com/ansible/ansible/issues/86117). + - dnf5 - return failure message which occurred while running RPM scriptlet (https://github.com/ansible/ansible/issues/86117). diff --git a/changelogs/fragments/slurp_noarmor.yml b/changelogs/fragments/slurp_noarmor.yml index 1705469ae81..1e5e1dab529 100644 --- a/changelogs/fragments/slurp_noarmor.yml +++ b/changelogs/fragments/slurp_noarmor.yml @@ -1,2 +1,2 @@ minor_changes: - - slurp module get's new C(armor) option to allow user to disable base64 encoding. + - slurp module gets new C(armor) option to allow user to disable base64 encoding. diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py index a9fa2c22110..5343cdc871b 100644 --- a/lib/ansible/executor/task_executor.py +++ b/lib/ansible/executor/task_executor.py @@ -782,7 +782,7 @@ class TaskExecutor: if _INJECT_FACTS: if _INJECT_FACTS_ORIGIN == 'default': # This happens x2 due to loops and being able to use values in subsequent iterations - # these copies are later discared in favor of 'total/final' one on loop end. + # these copies are later discarded in favor of 'total/final' one on loop end. cleaned_toplevel = {k: _deprecate_top_level_fact(v) for k, v in clean_facts(af).items()} else: cleaned_toplevel = clean_facts(af) diff --git a/lib/ansible/modules/dnf.py b/lib/ansible/modules/dnf.py index 6b0ae995c97..01edf973570 100644 --- a/lib/ansible/modules/dnf.py +++ b/lib/ansible/modules/dnf.py @@ -747,7 +747,7 @@ class DnfModule(YumDnf): # result in naive/inferior solution. # NOTE this has historically never worked even before https://github.com/ansible/ansible/pull/82725 # where our (buggy) custom code ignored wildcards for the installed checks. - # TODO reasearch how feasible it is to implement the above + # TODO research how feasible it is to implement the above if upgrade: # for upgrade we pass the spec to both upgrade and install, to satisfy both available and installed # packages evaluated from the glob spec diff --git a/lib/ansible/modules/dnf5.py b/lib/ansible/modules/dnf5.py index 4d619a39511..d20782bd301 100644 --- a/lib/ansible/modules/dnf5.py +++ b/lib/ansible/modules/dnf5.py @@ -724,7 +724,7 @@ class Dnf5Module(YumDnf): # package specs that evaluate to a single package, trying to mimic what would the dnf machinery do # for glob package specs and then filtering those for allow_downgrade appears to always # result in naive/inferior solution. - # TODO reasearch how feasible it is to implement the above + # TODO research how feasible it is to implement the above if upgrade: # for upgrade we pass the spec to both upgrade and install, to satisfy both available and installed # packages evaluated from the glob spec diff --git a/lib/ansible/utils/plugin_docs.py b/lib/ansible/utils/plugin_docs.py index 3bff309f4d9..20722e1d975 100644 --- a/lib/ansible/utils/plugin_docs.py +++ b/lib/ansible/utils/plugin_docs.py @@ -179,7 +179,7 @@ def add_fragments(doc, filename, fragment_loader, is_module=False, section='DOCU add_collection_to_versions_and_dates(fragment, real_collection_name, is_module=is_module, return_docs=(section == 'RETURN')) if section == 'DOCUMENTATION': - # notes, seealso, options and attributes entries are specificly merged, but only occur in documentation section + # notes, seealso, options and attributes entries are specifically merged, but only occur in documentation section for doc_key in ['notes', 'seealso']: if doc_key in fragment: entries = fragment.pop(doc_key) diff --git a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/ultimatequestion.yml b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/ultimatequestion.yml index 661cba82240..4048105d640 100644 --- a/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/ultimatequestion.yml +++ b/test/integration/targets/ansible-doc/collections/ansible_collections/testns/testcol/plugins/filter/ultimatequestion.yml @@ -1,13 +1,13 @@ DOCUMENTATION: name: ultimatequestion author: Terry Prachet - version_added: 'histerical' + version_added: 'hysterical' short_description: Ask any question but it will only respond with the answer to the ultimate one description: - read the book options: _input: - description: Anything you want, goign to ignore it anywayss ... + description: Anything you want, going to ignore it anyways ... type: raw required: true diff --git a/test/integration/targets/ansible-doc/filter_plugins/donothing.yml b/test/integration/targets/ansible-doc/filter_plugins/donothing.yml index 87fe2f9e4a4..d979fe8f4df 100644 --- a/test/integration/targets/ansible-doc/filter_plugins/donothing.yml +++ b/test/integration/targets/ansible-doc/filter_plugins/donothing.yml @@ -1,7 +1,7 @@ DOCUMENTATION: name: donothing author: lazy - version_added: 'histerical' + version_added: 'hysterical' short_description: noop description: - don't do anything diff --git a/test/integration/targets/ansible-doc/runme.sh b/test/integration/targets/ansible-doc/runme.sh index 6ce15b0a9da..f47f9412581 100755 --- a/test/integration/targets/ansible-doc/runme.sh +++ b/test/integration/targets/ansible-doc/runme.sh @@ -272,7 +272,7 @@ echo "testing no duplicates for plugins that only exist in ansible.builtin when [ "$(ansible-doc -l -t filter --playbook-dir ./ |grep -c 'b64encode')" -eq "1" ] echo "testing with playbook dir, legacy should override" -ansible-doc -t filter split --playbook-dir ./ -v|grep "${GREP_OPTS[@]}" histerical +ansible-doc -t filter split --playbook-dir ./ -v|grep "${GREP_OPTS[@]}" hysterical pyc_src="$(pwd)/filter_plugins/other.py" pyc_1="$(pwd)/filter_plugins/split.pyc" @@ -281,14 +281,14 @@ trap 'rm -rf "$pyc_1" "$pyc_2"' EXIT echo "testing pyc files are not used as adjacent documentation" python -c "import py_compile; py_compile.compile('$pyc_src', cfile='$pyc_1')" -ansible-doc -t filter split --playbook-dir ./ -v|grep "${GREP_OPTS[@]}" histerical +ansible-doc -t filter split --playbook-dir ./ -v|grep "${GREP_OPTS[@]}" hysterical echo "testing pyc files are not listed as plugins" python -c "import py_compile; py_compile.compile('$pyc_src', cfile='$pyc_2')" test "$(ansible-doc -l -t module --playbook-dir ./ 2>&1 1>/dev/null |grep -c "notaplugin")" == 0 echo "testing without playbook dir, builtin should return" -ansible-doc -t filter split -v 2>&1 |grep "${GREP_OPTS[@]}" -v histerical +ansible-doc -t filter split -v 2>&1 |grep "${GREP_OPTS[@]}" -v hysterical echo "test 'sidecar' for no extension module with .py doc" [ "$(ansible-doc -M ./library -l ansible.legacy |grep -v 'UNDOCUMENTED' |grep -c bogus_facts)" == "1" ] diff --git a/test/integration/targets/ansible-test-units-forked/runme.sh b/test/integration/targets/ansible-test-units-forked/runme.sh index c39f3c49244..1dc1141a474 100755 --- a/test/integration/targets/ansible-test-units-forked/runme.sh +++ b/test/integration/targets/ansible-test-units-forked/runme.sh @@ -19,7 +19,7 @@ for python in "${pythons[@]}"; do cat output.log echo "Unit tests on Python ${python} failed as expected. See output above. Checking for expected output ..." - # Verify that the appropriate tests pased, failed or xfailed. + # Verify that the appropriate tests passed, failed or xfailed. grep 'PASSED tests/unit/plugins/modules/test_ansible_forked.py::test_passed' output.log grep 'PASSED tests/unit/plugins/modules/test_ansible_forked.py::test_warning' output.log grep 'XFAIL tests/unit/plugins/modules/test_ansible_forked.py::test_kill_xfail' output.log diff --git a/test/integration/targets/ansible-vault/runme.sh b/test/integration/targets/ansible-vault/runme.sh index 1e2aba12ef9..a4acc645f4f 100755 --- a/test/integration/targets/ansible-vault/runme.sh +++ b/test/integration/targets/ansible-vault/runme.sh @@ -69,8 +69,8 @@ WRONG_RC=$? echo "rc was $WRONG_RC (5 is expected)" [ $WRONG_RC -eq 5 ] -# try to view the file encrypted with the vault-password we didnt specify -# to verify we didnt choose the wrong vault-id +# try to view the file encrypted with the vault-password we didn't specify +# to verify we didn't choose the wrong vault-id ansible-vault view "$@" --vault-id vault-password encrypted-vault-password FORMAT_1_1_HEADER="\$ANSIBLE_VAULT;1.1;AES256" @@ -215,7 +215,7 @@ WRONG_RC=$? echo "rc was $WRONG_RC (1 is expected)" [ $WRONG_RC -eq 1 ] -# try specifying a --encrypt-vault-id that doesnt exist, should exit with an error indicating +# try specifying a --encrypt-vault-id that doesn't exist, should exit with an error indicating # that --encrypt-vault-id and the known vault-ids ansible-vault encrypt "$@" --vault-password-file vault-password --encrypt-vault-id doesnt_exist "${TEST_FILE}" && : WRONG_RC=$? @@ -383,7 +383,7 @@ head -1 "${TEST_FILE_EDIT}" | grep "${FORMAT_1_1_HEADER}" ansible-vault encrypt "$@" --vault-id vault_password@vault-password "${TEST_FILE_EDIT2}" # verify that we aren't prompted for a new vault password on edit if we are running interactively (ie, with prompts) -# have to use setsid nd --ask-vault-pass to force a prompt to simulate. +# have to use setsid and --ask-vault-pass to force a prompt to simulate. # See https://github.com/ansible/ansible/issues/35834 setsid sh -c 'tty; echo password |ansible-vault edit --ask-vault-pass vault_test.yml' < /dev/null > log 2>&1 && : grep 'New Vault password' log && : @@ -411,8 +411,8 @@ echo "rc was $WRONG_RC (5 is expected)" # but this time specify with --encrypt-vault-id, but specifying vault-id names (instead of default) # ansible-vault encrypt "$@" --vault-id from_vault_password@vault-password --vault-id from_encrypted_vault_password@encrypted-vault-password --encrypt-vault-id from_encrypted_vault_password "${TEST_FILE(_ENC_PASSWORD}" -# try to view the file encrypted with the vault-password we didnt specify -# to verify we didnt choose the wrong vault-id +# try to view the file encrypted with the vault-password we didn't specify +# to verify we didn't choose the wrong vault-id # ansible-vault view "$@" --vault-id vault-password "${TEST_FILE_ENC_PASSWORD}" && : # WRONG_RC=$? # echo "rc was $WRONG_RC (1 is expected)" diff --git a/test/integration/targets/any_errors_fatal/50897.yml b/test/integration/targets/any_errors_fatal/50897.yml index 1d09eb18f03..0b1ff264001 100644 --- a/test/integration/targets/any_errors_fatal/50897.yml +++ b/test/integration/targets/any_errors_fatal/50897.yml @@ -4,13 +4,13 @@ tasks: - name: EXPECTED FAILURE include_role that doesn't exist include_role: - name: 'non-existant-role' + name: 'non-existent-role' when: - inventory_hostname == 'testhost2' - test_name == 'test_include_role' - name: EXPECTED FAILURE include_tasks that don't exist - include_tasks: non-existant.yml + include_tasks: non-existent.yml when: - inventory_hostname == 'testhost2' - test_name == 'test_include_tasks' diff --git a/test/integration/targets/apt/tasks/apt.yml b/test/integration/targets/apt/tasks/apt.yml index 8dad838547b..da3825279a0 100644 --- a/test/integration/targets/apt/tasks/apt.yml +++ b/test/integration/targets/apt/tasks/apt.yml @@ -712,7 +712,7 @@ register: dpkg_result ignore_errors: true -- name: Verify that package removal was succesfull +- name: Verify that package removal was successful assert: that: - package_removed is success diff --git a/test/integration/targets/apt_repository/tasks/mode.yaml b/test/integration/targets/apt_repository/tasks/mode.yaml index fd29cf30fa0..ce07d0f574e 100644 --- a/test/integration/targets/apt_repository/tasks/mode.yaml +++ b/test/integration/targets/apt_repository/tasks/mode.yaml @@ -127,7 +127,7 @@ # The literal 0600 can be interpreted as octal correctly. Note that # a decimal 644 is octal 420. The default perm is 0644 so a misinterpretation # of 644 was previously resulting in a default file mode of 0420. -# 'mode: 600' is likely not what a user meant but there isnt enough info +# 'mode: 600' is likely not what a user meant but there isn't enough info # to determine that. Note that a string arg of '600' will be interpreted as 0600. # See https://github.com/ansible/ansible/issues/16370 - name: Assert mode_given_yaml_literal_600 is correct diff --git a/test/integration/targets/assert/tasks/main.yml b/test/integration/targets/assert/tasks/main.yml index de8c653efed..07b445d8118 100644 --- a/test/integration/targets/assert/tasks/main.yml +++ b/test/integration/targets/assert/tasks/main.yml @@ -222,10 +222,10 @@ - name: ensure that arg-splatted expressions that are template-wrapped provide a deprecation warning assert: - that: '{{ thats }}' + that: '{{ that_list }}' vars: ansible_deprecation_warnings: true - thats: + that_list: - '{{ 1 == 1 }}' register: result diff --git a/test/integration/targets/callback-dispatch/callback_plugins/legacy_warning_display.py b/test/integration/targets/callback-dispatch/callback_plugins/legacy_warning_display.py index b4cc6d79a2b..083243b096e 100644 --- a/test/integration/targets/callback-dispatch/callback_plugins/legacy_warning_display.py +++ b/test/integration/targets/callback-dispatch/callback_plugins/legacy_warning_display.py @@ -25,7 +25,7 @@ class CallbackModule(CallbackBase): 'v2_playbook_on_include', 'v2_runner_on_start', } - # we're abusing runtime assertions to signify failure in this integration test component; ensure they're not disabled by opimizations + # we're abusing runtime assertions to signify failure in this integration test component; ensure they're not disabled by optimizations try: assert False except AssertionError: diff --git a/test/integration/targets/config/files/types.env b/test/integration/targets/config/files/types.env index 675d2064b30..1d1cb11718a 100644 --- a/test/integration/targets/config/files/types.env +++ b/test/integration/targets/config/files/types.env @@ -1,14 +1,14 @@ -# valid(list): does nothihng, just for testing values +# valid(list): does nothing, just for testing values ANSIBLE_TYPES_VALID= -# mustunquote(list): does nothihng, just for testing values +# mustunquote(list): does nothing, just for testing values ANSIBLE_TYPES_MUSTUNQUOTE= -# notvalid(list): does nothihng, just for testing values +# notvalid(list): does nothing, just for testing values ANSIBLE_TYPES_NOTVALID= -# totallynotvalid(list): does nothihng, just for testing values +# totallynotvalid(list): does nothing, just for testing values ANSIBLE_TYPES_TOTALLYNOTVALID= -# str_mustunquote(string): does nothihng, just for testing values +# str_mustunquote(string): does nothing, just for testing values ANSIBLE_TYPES_STR_MUSTUNQUOTE= diff --git a/test/integration/targets/config/files/types.ini b/test/integration/targets/config/files/types.ini index 15af0a3d458..8e407577611 100644 --- a/test/integration/targets/config/files/types.ini +++ b/test/integration/targets/config/files/types.ini @@ -1,18 +1,18 @@ [list_values] -# (list) does nothihng, just for testing values +# (list) does nothing, just for testing values mustunquote= -# (list) does nothihng, just for testing values +# (list) does nothing, just for testing values notvalid= -# (list) does nothihng, just for testing values +# (list) does nothing, just for testing values totallynotvalid= -# (list) does nothihng, just for testing values +# (list) does nothing, just for testing values valid= [string_values] -# (string) does nothihng, just for testing values +# (string) does nothing, just for testing values str_mustunquote= diff --git a/test/integration/targets/config/files/types.vars b/test/integration/targets/config/files/types.vars index 7c9d1fe6778..4bd15a2255c 100644 --- a/test/integration/targets/config/files/types.vars +++ b/test/integration/targets/config/files/types.vars @@ -1,19 +1,19 @@ -# valid(list): does nothihng, just for testing values +# valid(list): does nothing, just for testing values ansible_types_valid: '' -# mustunquote(list): does nothihng, just for testing values +# mustunquote(list): does nothing, just for testing values ansible_types_mustunquote: '' -# notvalid(list): does nothihng, just for testing values +# notvalid(list): does nothing, just for testing values ansible_types_notvalid: '' -# totallynotvalid(list): does nothihng, just for testing values +# totallynotvalid(list): does nothing, just for testing values ansible_types_totallynotvalid: '' -# str_mustunquote(string): does nothihng, just for testing values +# str_mustunquote(string): does nothing, just for testing values ansible_types_str_mustunquote: '' diff --git a/test/integration/targets/config/lookup_plugins/bogus.py b/test/integration/targets/config/lookup_plugins/bogus.py index 3a31c35338d..85dc07a4c4b 100644 --- a/test/integration/targets/config/lookup_plugins/bogus.py +++ b/test/integration/targets/config/lookup_plugins/bogus.py @@ -7,7 +7,7 @@ from __future__ import annotations DOCUMENTATION = """ name: bogus author: Ansible Core Team - version_added: histerical + version_added: hysterical short_description: returns what you gave it description: - this is mostly a noop @@ -15,7 +15,7 @@ DOCUMENTATION = """ _terms: description: stuff to pass through test_list: - description: does nothihng, just for testing values + description: does nothing, just for testing values type: list choices: - Dan diff --git a/test/integration/targets/config/lookup_plugins/casting.py b/test/integration/targets/config/lookup_plugins/casting.py index 55232018769..5161cc237a5 100644 --- a/test/integration/targets/config/lookup_plugins/casting.py +++ b/test/integration/targets/config/lookup_plugins/casting.py @@ -7,7 +7,7 @@ from __future__ import annotations DOCUMENTATION = """ name: casting author: Ansible Core Team - version_added: histerical + version_added: hysterical short_description: returns what you gave it description: - this is mostly a noop @@ -15,16 +15,16 @@ DOCUMENTATION = """ _terms: description: stuff to pass through test_list: - description: does nothihng, just for testing values + description: does nothing, just for testing values type: list test_int: - description: does nothihng, just to test casting + description: does nothing, just to test casting type: int test_bool: - description: does nothihng, just to test casting + description: does nothing, just to test casting type: bool test_str: - description: does nothihng, just to test casting + description: does nothing, just to test casting type: str """ diff --git a/test/integration/targets/config/lookup_plugins/casting_individual.py b/test/integration/targets/config/lookup_plugins/casting_individual.py index b877bd8e326..474fb6deec2 100644 --- a/test/integration/targets/config/lookup_plugins/casting_individual.py +++ b/test/integration/targets/config/lookup_plugins/casting_individual.py @@ -7,7 +7,7 @@ from __future__ import annotations DOCUMENTATION = """ name: casting_individual author: Ansible Core Team - version_added: histerical + version_added: hysterical short_description: returns what you gave it description: - this is mostly a noop @@ -15,16 +15,16 @@ DOCUMENTATION = """ _terms: description: stuff to pass through test_list: - description: does nothihng, just for testing values + description: does nothing, just for testing values type: list test_int: - description: does nothihng, just to test casting + description: does nothing, just to test casting type: int test_bool: - description: does nothihng, just to test casting + description: does nothing, just to test casting type: bool test_str: - description: does nothihng, just to test casting + description: does nothing, just to test casting type: str """ diff --git a/test/integration/targets/config/lookup_plugins/types.py b/test/integration/targets/config/lookup_plugins/types.py index 0b1e978bb80..3f4cc8fdec0 100644 --- a/test/integration/targets/config/lookup_plugins/types.py +++ b/test/integration/targets/config/lookup_plugins/types.py @@ -7,7 +7,7 @@ from __future__ import annotations DOCUMENTATION = """ name: types author: Ansible Core Team - version_added: histerical + version_added: hysterical short_description: returns what you gave it description: - this is mostly a noop @@ -15,7 +15,7 @@ DOCUMENTATION = """ _terms: description: stuff to pass through valid: - description: does nothihng, just for testing values + description: does nothing, just for testing values type: list ini: - section: list_values @@ -25,7 +25,7 @@ DOCUMENTATION = """ vars: - name: ansible_types_valid mustunquote: - description: does nothihng, just for testing values + description: does nothing, just for testing values type: list ini: - section: list_values @@ -35,7 +35,7 @@ DOCUMENTATION = """ vars: - name: ansible_types_mustunquote notvalid: - description: does nothihng, just for testing values + description: does nothing, just for testing values type: list ini: - section: list_values @@ -45,7 +45,7 @@ DOCUMENTATION = """ vars: - name: ansible_types_notvalid totallynotvalid: - description: does nothihng, just for testing values + description: does nothing, just for testing values type: list ini: - section: list_values @@ -55,7 +55,7 @@ DOCUMENTATION = """ vars: - name: ansible_types_totallynotvalid str_mustunquote: - description: does nothihng, just for testing values + description: does nothing, just for testing values type: string ini: - section: string_values diff --git a/test/integration/targets/cron/tasks/main.yml b/test/integration/targets/cron/tasks/main.yml index 45640e1e82b..155350784cf 100644 --- a/test/integration/targets/cron/tasks/main.yml +++ b/test/integration/targets/cron/tasks/main.yml @@ -164,7 +164,7 @@ name: "integration test cron" state: absent - - name: Check file succesfull deletion + - name: Check file successful deletion stat: path: /etc/cron.d/cron_remove_name register: cron_file_stats @@ -200,7 +200,7 @@ name: "integration test cron" state: absent - - name: Check file succesfull deletion + - name: Check file successful deletion stat: path: /etc/cron.d/cron_remove_whitespace register: cron_file_stats @@ -280,7 +280,7 @@ name: "cron job that contain non-ascii chars in job (これは日本語です; This is Japanese)" state: absent - - name: Check file succesfull deletion + - name: Check file successful deletion stat: path: /etc/cron.d/cron_nonascii register: cron_file_stats @@ -312,7 +312,7 @@ name: "integration test cron" state: absent - - name: Check file succesfull deletion + - name: Check file successful deletion stat: path: "/etc/cron.d/なせば大抵なんとかなる👊" register: cron_file_stats diff --git a/test/integration/targets/delegate_to/connection_plugins/fakelocal.py b/test/integration/targets/delegate_to/connection_plugins/fakelocal.py index 6696ac74179..81d6abee5fc 100644 --- a/test/integration/targets/delegate_to/connection_plugins/fakelocal.py +++ b/test/integration/targets/delegate_to/connection_plugins/fakelocal.py @@ -8,7 +8,7 @@ DOCUMENTATION = """ description: - This connection plugin just verifies parameters passed in author: ansible (@core) - version_added: histerical + version_added: hysterical options: password: description: Authentication password for the C(remote_user). Can be supplied as CLI option. diff --git a/test/integration/targets/delegate_to/delegate_facts_loop.yml b/test/integration/targets/delegate_to/delegate_facts_loop.yml index b05c4064025..306ff6ba7e1 100644 --- a/test/integration/targets/delegate_to/delegate_facts_loop.yml +++ b/test/integration/targets/delegate_to/delegate_facts_loop.yml @@ -7,7 +7,7 @@ delegate_facts: true loop: "{{ groups['all'] | difference(['localhost']) }}" - - name: ensure we didnt create it on current host + - name: ensure we didn't create it on current host assert: that: - test is undefined @@ -20,7 +20,7 @@ loop: "{{ groups['all'] | difference(['localhost'])}}" -- name: test that we don't polute whole group with one value +- name: test that we don't pollute whole group with one value hosts: localhost gather_facts: no vars: diff --git a/test/integration/targets/delegate_to/delegate_vars_handling.yml b/test/integration/targets/delegate_to/delegate_vars_handling.yml index be3ed72ad6e..f4025c3942d 100644 --- a/test/integration/targets/delegate_to/delegate_vars_handling.yml +++ b/test/integration/targets/delegate_to/delegate_vars_handling.yml @@ -45,6 +45,6 @@ that: - bad_args_ping is failed or bad_args_ping is unreachable - - name: this should work by ignoring the bad ags for orig host + - name: this should work by ignoring the bad args for orig host ping: delegate_to: delegatetome diff --git a/test/integration/targets/deprecations/library/willremove.py b/test/integration/targets/deprecations/library/willremove.py index 87e91768401..304c8920d2e 100644 --- a/test/integration/targets/deprecations/library/willremove.py +++ b/test/integration/targets/deprecations/library/willremove.py @@ -8,7 +8,7 @@ from __future__ import annotations DOCUMENTATION = r""" --- module: willremove -version_added: histerical +version_added: hysterical short_description: does nothing description: does nothing, this is deprecation test deprecated: diff --git a/test/integration/targets/dnf/tasks/repo.yml b/test/integration/targets/dnf/tasks/repo.yml index 00034169b09..40bc5b9f686 100644 --- a/test/integration/targets/dnf/tasks/repo.yml +++ b/test/integration/targets/dnf/tasks/repo.yml @@ -711,7 +711,7 @@ name: dinginessentail state: absent -- name: Test failures occured during loading repositories are properly handled +- name: Test failures occurred during loading repositories are properly handled vars: repo_name: test-non-existing-gpgkey-file block: diff --git a/test/integration/targets/gathering/smart.yml b/test/integration/targets/gathering/smart.yml index 735cb461be6..138589ed357 100644 --- a/test/integration/targets/gathering/smart.yml +++ b/test/integration/targets/gathering/smart.yml @@ -13,7 +13,7 @@ - hosts: testhost tasks: - - name: ensure we still have facts, but didnt pickup new local ones + - name: ensure we still have facts, but didn't pickup new local ones assert: that: - ansible_facts is defined and 'fqdn' in ansible_facts diff --git a/test/integration/targets/gathering_facts/cache_plugins/none.py b/test/integration/targets/gathering_facts/cache_plugins/none.py index 0150eb4b645..c9c0223c7fb 100644 --- a/test/integration/targets/gathering_facts/cache_plugins/none.py +++ b/test/integration/targets/gathering_facts/cache_plugins/none.py @@ -34,7 +34,7 @@ class CacheModule(BaseCacheModule): return key in self.empty def delete(self, key): - del self.emtpy[key] + del self.empty[key] def flush(self): self.empty = {} diff --git a/test/integration/targets/gathering_facts/test_gathering_facts.yml b/test/integration/targets/gathering_facts/test_gathering_facts.yml index faa187b73e1..b80069c4bfe 100644 --- a/test/integration/targets/gathering_facts/test_gathering_facts.yml +++ b/test/integration/targets/gathering_facts/test_gathering_facts.yml @@ -454,7 +454,7 @@ - ohai gather_facts: yes tasks: - - name: Test that retrieving facter and ohai doesnt fail + - name: Test that retrieving facter and ohai doesn't fail assert: # not much to assert here, aside from not crashing, since test images dont have # facter/ohai diff --git a/test/integration/targets/git/tasks/submodules.yml b/test/integration/targets/git/tasks/submodules.yml index 95247dbfac5..54a8d23d6b9 100644 --- a/test/integration/targets/git/tasks/submodules.yml +++ b/test/integration/targets/git/tasks/submodules.yml @@ -119,7 +119,7 @@ command: 'ls -1a {{ checkout_dir }}/submodule2' register: submodule2 -- name: SUBMODULES | Enusre submodule2 is at the appropriate commit +- name: SUBMODULES | Ensure submodule2 is at the appropriate commit assert: that: submodule2.stdout_lines | length == 4 diff --git a/test/integration/targets/handlers/test_listening_handlers.yml b/test/integration/targets/handlers/test_listening_handlers.yml index f4c3cae4b29..834466cc5bb 100644 --- a/test/integration/targets/handlers/test_listening_handlers.yml +++ b/test/integration/targets/handlers/test_listening_handlers.yml @@ -13,7 +13,7 @@ changed_when: true notify: another_listen - - name: nofity another handler 2 + - name: notify another handler 2 debug: changed_when: true notify: another_listen diff --git a/test/integration/targets/hostname/tasks/MacOSX.yml b/test/integration/targets/hostname/tasks/MacOSX.yml index 912ced707b6..95a20aa6a22 100644 --- a/test/integration/targets/hostname/tasks/MacOSX.yml +++ b/test/integration/targets/hostname/tasks/MacOSX.yml @@ -4,17 +4,17 @@ # These tasks can be changed to a loop once https://github.com/ansible/ansible/issues/71031 # is fixed -- name: macOS | Set hostname specifiying macos strategy +- name: macOS | Set hostname specifying macos strategy hostname: name: bugs.acme.example.com use: macos -- name: macOS | Set hostname specifiying macosx strategy +- name: macOS | Set hostname specifying macosx strategy hostname: name: bugs.acme.example.com use: macosx -- name: macOS | Set hostname specifiying darwin strategy +- name: macOS | Set hostname specifying darwin strategy hostname: name: bugs.acme.example.com use: darwin diff --git a/test/integration/targets/include_import/tasks/test_import_tasks.yml b/test/integration/targets/include_import/tasks/test_import_tasks.yml index 8f07bb9090f..2d1ee1b7629 100644 --- a/test/integration/targets/include_import/tasks/test_import_tasks.yml +++ b/test/integration/targets/include_import/tasks/test_import_tasks.yml @@ -32,7 +32,7 @@ - name: Import task inside always import_tasks: tasks4.yml - - name: Validate that variables set in previously improted tasks are passed down. + - name: Validate that variables set in previously imported tasks are passed down. import_tasks: validate3.yml - name: Assert that tasks4 was included diff --git a/test/integration/targets/include_import/tasks/test_include_tasks.yml b/test/integration/targets/include_import/tasks/test_include_tasks.yml index e3ed4c09dd7..13def842ce5 100644 --- a/test/integration/targets/include_import/tasks/test_include_tasks.yml +++ b/test/integration/targets/include_import/tasks/test_include_tasks.yml @@ -32,7 +32,7 @@ - name: Include task inside always include_tasks: tasks4.yml - - name: Validate that variables set in previously improted tasks are passed down + - name: Validate that variables set in previously imported tasks are passed down include_tasks: validate3.yml - name: Assert that tasks4 was included diff --git a/test/integration/targets/include_import/test_nested_tasks.yml b/test/integration/targets/include_import/test_nested_tasks.yml index 7451ec4e863..8ef1a9d008e 100644 --- a/test/integration/targets/include_import/test_nested_tasks.yml +++ b/test/integration/targets/include_import/test_nested_tasks.yml @@ -1,6 +1,6 @@ - name: >- verify that multiple level of nested statements and - include+meta doesnt mess included files mecanisms + include+meta doesn't mess included files mechanisms hosts: testhost tasks: - include_tasks: ./tasks/nested/nested.yml diff --git a/test/integration/targets/include_import/test_nested_tasks_fqcn.yml b/test/integration/targets/include_import/test_nested_tasks_fqcn.yml index 14e72eed1bf..2d72d53bf42 100644 --- a/test/integration/targets/include_import/test_nested_tasks_fqcn.yml +++ b/test/integration/targets/include_import/test_nested_tasks_fqcn.yml @@ -1,6 +1,6 @@ - name: >- verify that multiple level of nested statements and - include+meta doesnt mess included files mecanisms + include+meta doesn't mess included files mechanisms hosts: testhost tasks: - ansible.builtin.include_tasks: ./tasks/nested/nested.yml diff --git a/test/integration/targets/lookup_config/lookup_plugins/bogus.py b/test/integration/targets/lookup_config/lookup_plugins/bogus.py index 9c90b3909cc..41e01e683b5 100644 --- a/test/integration/targets/lookup_config/lookup_plugins/bogus.py +++ b/test/integration/targets/lookup_config/lookup_plugins/bogus.py @@ -7,7 +7,7 @@ from __future__ import annotations DOCUMENTATION = """ name: bogus author: Ansible Core Team - version_added: histerical + version_added: hysterical short_description: returns what you gave it description: - this is mostly a noop @@ -15,7 +15,7 @@ DOCUMENTATION = """ _terms: description: stuff to pass through test_list: - description: does nothihng, just for testing values + description: does nothing, just for testing values type: string required: True """ diff --git a/test/integration/targets/lookup_first_found/tasks/main.yml b/test/integration/targets/lookup_first_found/tasks/main.yml index e8595c3b5de..4c69fedb883 100644 --- a/test/integration/targets/lookup_first_found/tasks/main.yml +++ b/test/integration/targets/lookup_first_found/tasks/main.yml @@ -243,7 +243,7 @@ - "{{role_path}}/vars" - name: ensure vars subdir is searched for var-named actions - # DTFIX5: the following *should* work, but since task.action is not templated by TE, it does not + # DTFIX5: the following *should* work, but since task.action is not templated by TaskExecutor, it does not # action: '{{ "debug_v" ~ "ar_alias" }}' # args: # var: item diff --git a/test/integration/targets/lookup_password/tasks/main.yml b/test/integration/targets/lookup_password/tasks/main.yml index dacf032db31..2fa44e9a668 100644 --- a/test/integration/targets/lookup_password/tasks/main.yml +++ b/test/integration/targets/lookup_password/tasks/main.yml @@ -116,7 +116,7 @@ loop: "{{ l }}" register: passwords_noseed - - name: verify they are all different, this is not guaranteed, but statisically almost impossible + - name: verify they are all different, this is not guaranteed, but statistically almost impossible assert: that: - pns[0]['msg'] != pns[1]['msg'] diff --git a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/meta/runtime.yml b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/meta/runtime.yml index 215a60ded2b..fb1bc120a14 100644 --- a/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/meta/runtime.yml +++ b/test/integration/targets/module_defaults/collections/ansible_collections/testns/testcoll/meta/runtime.yml @@ -32,7 +32,7 @@ plugin_routing: module_uses_action_defaults: redirect: testns.testcoll.module - # Not "eos_facts" to ensure TE is not finding handler via prefix + # Not "eos_facts" to ensure TaskExecutor is not finding handler via prefix # eosfacts tasks should not get eos module_defaults (or defaults for other modules that use eos action plugin) eosfacts: action_plugin: testns.testcoll.eos diff --git a/test/integration/targets/module_no_log/tasks/main.yml b/test/integration/targets/module_no_log/tasks/main.yml index c17aa825113..6007fffce2a 100644 --- a/test/integration/targets/module_no_log/tasks/main.yml +++ b/test/integration/targets/module_no_log/tasks/main.yml @@ -68,7 +68,7 @@ register: ouch ignore_errors: true - - name: no log wont obscure booleans when True, but still hide in msg + - name: no log won't obscure booleans when True, but still hide in msg assert: that: - ouch['changed'] is boolean @@ -80,7 +80,7 @@ register: ouch ignore_errors: true - - name: no log wont obscure booleans when False, but still hide in msg + - name: no log won't obscure booleans when False, but still hide in msg assert: that: - ouch['changed'] is boolean diff --git a/test/integration/targets/module_utils_Ansible.AccessToken/library/ansible_access_token_tests.ps1 b/test/integration/targets/module_utils_Ansible.AccessToken/library/ansible_access_token_tests.ps1 index a1de2b4e9e5..193f7160888 100644 --- a/test/integration/targets/module_utils_Ansible.AccessToken/library/ansible_access_token_tests.ps1 +++ b/test/integration/targets/module_utils_Ansible.AccessToken/library/ansible_access_token_tests.ps1 @@ -104,7 +104,7 @@ $tests = [Ordered]@{ $failed = $false try { $h_process = [Ansible.AccessToken.TokenUtil]::OpenProcess(4, "QueryInformation", $false) - $h_process.Dispose() # Incase this doesn't fail, make sure we still dispose of it + $h_process.Dispose() # In case this doesn't fail, make sure we still dispose of it } catch [Ansible.AccessToken.Win32Exception] { $failed = $true diff --git a/test/integration/targets/module_utils_Ansible.Become/library/ansible_become_tests.ps1 b/test/integration/targets/module_utils_Ansible.Become/library/ansible_become_tests.ps1 index 163d035a779..1a950f992b7 100644 --- a/test/integration/targets/module_utils_Ansible.Become/library/ansible_become_tests.ps1 +++ b/test/integration/targets/module_utils_Ansible.Become/library/ansible_become_tests.ps1 @@ -127,7 +127,7 @@ namespace Ansible public enum SECURITY_LOGON_TYPE { - System = 0, // Used only by the Sytem account + System = 0, // Used only by the System account Interactive = 2, Network, Batch, diff --git a/test/integration/targets/module_utils_Ansible.ModuleUtils.FileUtil/library/file_util_test.ps1 b/test/integration/targets/module_utils_Ansible.ModuleUtils.FileUtil/library/file_util_test.ps1 index c38f4e61e90..7d8f26289ba 100644 --- a/test/integration/targets/module_utils_Ansible.ModuleUtils.FileUtil/library/file_util_test.ps1 +++ b/test/integration/targets/module_utils_Ansible.ModuleUtils.FileUtil/library/file_util_test.ps1 @@ -56,7 +56,7 @@ Assert-Equal -actual $actual -expected $false $actual = Test-AnsiblePath -Path C:\fakedirectory Assert-Equal -actual $actual -expected $false -# Test-AnsiblePath file in non-existant directory +# Test-AnsiblePath file in non-existent directory $actual = Test-AnsiblePath -Path C:\fakedirectory\fakefile.txt Assert-Equal -actual $actual -expected $false diff --git a/test/integration/targets/module_utils_Ansible.Privilege/library/ansible_privilege_tests.ps1 b/test/integration/targets/module_utils_Ansible.Privilege/library/ansible_privilege_tests.ps1 index 58ee9c113a7..2a7c5c1fdc4 100644 --- a/test/integration/targets/module_utils_Ansible.Privilege/library/ansible_privilege_tests.ps1 +++ b/test/integration/targets/module_utils_Ansible.Privilege/library/ansible_privilege_tests.ps1 @@ -179,7 +179,7 @@ $tests = @{ $actual.SeIncreaseWorkingSetPrivilege -band [Ansible.Privilege.PrivilegeAttributes]::Enabled | Assert-Equal -Expected 0 $actual.ContainsKey("SeTcbPrivilege") | Assert-Equal -Expected $false - # Now verify a no-op enabler will not rever back to disabled + # Now verify a no-op enabler will not revert back to disabled $enabler2 = New-Object -TypeName Ansible.Privilege.PrivilegeEnabler -ArgumentList $false, "SeTimeZonePrivilege", "SeShutdownPrivilege", "SeTcbPrivilege" $enabler2.Dispose() $actual = [Ansible.Privilege.PrivilegeUtil]::GetAllPrivilegeInfo($process) @@ -217,7 +217,7 @@ $tests = @{ Assert-Equal -Expected ([Ansible.Privilege.PrivilegeAttributes]::Enabled) $actual.SeIncreaseWorkingSetPrivilege -band [Ansible.Privilege.PrivilegeAttributes]::Enabled | Assert-Equal -Expected 0 - # Now verify a no-op enabler will not rever back to disabled + # Now verify a no-op enabler will not revert back to disabled $enabler2 = New-Object -TypeName Ansible.Privilege.PrivilegeEnabler -ArgumentList $true, "SeTimeZonePrivilege", "SeShutdownPrivilege" $enabler2.Dispose() $actual = [Ansible.Privilege.PrivilegeUtil]::GetAllPrivilegeInfo($process) diff --git a/test/integration/targets/module_utils_Ansible.Service/library/ansible_service_tests.ps1 b/test/integration/targets/module_utils_Ansible.Service/library/ansible_service_tests.ps1 index dab42d4c229..1049e1eb9b2 100644 --- a/test/integration/targets/module_utils_Ansible.Service/library/ansible_service_tests.ps1 +++ b/test/integration/targets/module_utils_Ansible.Service/library/ansible_service_tests.ps1 @@ -289,7 +289,7 @@ $tests = [Ordered]@{ } - "Modfiy ServiceType" = { + "Modify ServiceType" = { $service = New-Object -TypeName Ansible.Service.Service -ArgumentList $serviceName $service.ServiceType = [Ansible.Service.ServiceType]::Win32ShareProcess diff --git a/test/integration/targets/pip/tasks/pip.yml b/test/integration/targets/pip/tasks/pip.yml index a4c9b8d4f40..e579922db32 100644 --- a/test/integration/targets/pip/tasks/pip.yml +++ b/test/integration/targets/pip/tasks/pip.yml @@ -112,7 +112,7 @@ virtualenv: "{{ remote_tmp_dir }}/pipenv" register: req_installed -- name: "check that a change didn't occurr this time (bug ansible#1705)" +- name: "check that a change didn't occur this time (bug ansible#1705)" assert: that: - "not (req_installed is changed)" @@ -124,7 +124,7 @@ editable: True register: url_installed -- name: "check that a change didn't occurr (bug ansible-modules-core#1645)" +- name: "check that a change didn't occur (bug ansible-modules-core#1645)" assert: that: - "not (url_installed is changed)" diff --git a/test/integration/targets/plugin_config_for_inventory/cache_plugins/none.py b/test/integration/targets/plugin_config_for_inventory/cache_plugins/none.py index 449231f803c..c206a8aecc6 100644 --- a/test/integration/targets/plugin_config_for_inventory/cache_plugins/none.py +++ b/test/integration/targets/plugin_config_for_inventory/cache_plugins/none.py @@ -46,7 +46,7 @@ class CacheModule(BaseCacheModule): return key in self.empty def delete(self, key): - del self.emtpy[key] + del self.empty[key] def flush(self): self.empty = {} diff --git a/test/integration/targets/replace/tasks/main.yml b/test/integration/targets/replace/tasks/main.yml index ab5f7782215..185b0a2d96c 100644 --- a/test/integration/targets/replace/tasks/main.yml +++ b/test/integration/targets/replace/tasks/main.yml @@ -96,7 +96,7 @@ - replace_cat3.stdout_lines[1] == 'We promptly judg3d antiqu3 ivory buckl3s for th3 n3xt priz3.' -## test ^$ behavior in MULTILINE, and . behavior in absense of DOTALL +## test ^$ behavior in MULTILINE, and . behavior in absence of DOTALL - name: quote everything between bof and eof replace: path: "{{ remote_tmp_dir_test }}/pangrams.04.txt" diff --git a/test/integration/targets/template/corner_cases.yml b/test/integration/targets/template/corner_cases.yml index ad711e5a927..aef5a7b5362 100644 --- a/test/integration/targets/template/corner_cases.yml +++ b/test/integration/targets/template/corner_cases.yml @@ -1,4 +1,4 @@ -- name: test tempating corner cases +- name: test templating corner cases hosts: localhost gather_facts: false vars: diff --git a/test/integration/targets/template/tasks/backup_test.yml b/test/integration/targets/template/tasks/backup_test.yml index eb4eff1700c..e5e2b822d8d 100644 --- a/test/integration/targets/template/tasks/backup_test.yml +++ b/test/integration/targets/template/tasks/backup_test.yml @@ -26,7 +26,7 @@ owner: "{{ t_username }}" group: "{{ t_groupname }}" -- name: failsafe attr change incase underlying system does not support it +- name: failsafe attr change in case underlying system does not support it shell: chattr =j "{{ t_dest }}" ignore_errors: True diff --git a/test/integration/targets/test_uri/tasks/main.yml b/test/integration/targets/test_uri/tasks/main.yml index 21a47a9e94d..4f141c72a73 100644 --- a/test/integration/targets/test_uri/tasks/main.yml +++ b/test/integration/targets/test_uri/tasks/main.yml @@ -15,7 +15,7 @@ - "'http://admin:secret@example.com' is uri" - "'ftps://admin:secret@example.com' is uri" - "'admin:secret@example.com' is uri" # scheme is implied - - "'http://admin:secret@example.com/myfile?parm=1¶m=2' is uri" + - "'http://admin:secret@example.com/myfile?param=1¶m=2' is uri" - "'urn:isbn:9780307476463' is uri" # book ref - name: Assert url tests @@ -33,7 +33,7 @@ - "'http://admin:secret@example.com' is url" - "'ftps://admin:secret@example.com' is url" - "'admin:secret@example.com' is not url" - - "'http://admin:secret@example.com/myfile?parm=1¶m=2' is url" + - "'http://admin:secret@example.com/myfile?param=1¶m=2' is url" - "'urn:isbn:9780307476463' is not url" # book ref - name: assert urn assert: diff --git a/test/integration/targets/user/tasks/ssh_keygen.yml b/test/integration/targets/user/tasks/ssh_keygen.yml index e23bc48ee8c..5a7bf5334ab 100644 --- a/test/integration/targets/user/tasks/ssh_keygen.yml +++ b/test/integration/targets/user/tasks/ssh_keygen.yml @@ -8,7 +8,7 @@ - '{{ssh_key_file}}' - '{{pub_file}}' block: - - name: Ensure clean/non existsing ansibulluser + - name: Ensure clean/non existing ansibulluser user: name=ansibulluser state=absent - name: Test creating ssh key creation @@ -37,7 +37,7 @@ file: path={{ home ~ item }} state=absent loop: '{{ key_files }}' - - name: Ensure clean/non existsing ansibulluser + - name: Ensure clean/non existing ansibulluser user: name=ansibulluser state=absent - name: Ensure we don't break on conflicts @@ -96,5 +96,5 @@ file: path={{ home ~ item }} state=absent loop: '{{ key_files + [flagfile.path] }}' - - name: Ensure clean/non existsing ansibulluser + - name: Ensure clean/non existing ansibulluser user: name=ansibulluser state=absent diff --git a/test/integration/targets/user/tasks/test_create_user.yml b/test/integration/targets/user/tasks/test_create_user.yml index 1e2bc51b0f6..a0a27a2e01a 100644 --- a/test/integration/targets/user/tasks/test_create_user.yml +++ b/test/integration/targets/user/tasks/test_create_user.yml @@ -66,7 +66,7 @@ - "user_test1.results[3]['state'] == 'present'" - "user_test1.results[4]['state'] == 'present'" -- name: register user informations +- name: register user information when: ansible_facts.system == 'Darwin' command: dscl . -read /Users/ansibulluser register: user_test2 diff --git a/test/integration/targets/user/tasks/test_create_user_home.yml b/test/integration/targets/user/tasks/test_create_user_home.yml index 8c7728f5dce..c46c229f70c 100644 --- a/test/integration/targets/user/tasks/test_create_user_home.yml +++ b/test/integration/targets/user/tasks/test_create_user_home.yml @@ -137,7 +137,7 @@ - name: Create user home directory with /dev/null as skeleton, https://github.com/ansible/ansible/issues/75063 # create_homedir is mostly used by linux, rest of OSs take care of it themselves via -k option (which fails this task) - # OS X actuall breaks since it does not implement getpwnam() + # OS X actually breaks since it does not implement getpwnam() when: ansible_system == 'Linux' block: - name: "Create user home directory with /dev/null as skeleton" diff --git a/test/integration/targets/var_blending/roles/test_var_blending/files/foo.txt b/test/integration/targets/var_blending/roles/test_var_blending/files/foo.txt index d51be39b1b3..34d3d9c618f 100644 --- a/test/integration/targets/var_blending/roles/test_var_blending/files/foo.txt +++ b/test/integration/targets/var_blending/roles/test_var_blending/files/foo.txt @@ -52,7 +52,7 @@ some tests above about group order. Here are a few more. * -e variables always win * then comes "most everything else" * then comes variables defined in inventory - * then "role defaults", which are the most "defaulty" and lose in priority to everything. + * then "role defaults", which are the most "default-like" and lose in priority to everything. Given the above rules, here's a test that a -e variable overrides inventory, and also defaults, and role vars. diff --git a/test/integration/targets/var_blending/roles/test_var_blending/templates/foo.j2 b/test/integration/targets/var_blending/roles/test_var_blending/templates/foo.j2 index 10709b1adbe..ddca953578c 100644 --- a/test/integration/targets/var_blending/roles/test_var_blending/templates/foo.j2 +++ b/test/integration/targets/var_blending/roles/test_var_blending/templates/foo.j2 @@ -52,7 +52,7 @@ some tests above about group order. Here are a few more. * -e variables always win * then comes "most everything else" * then comes variables defined in inventory - * then "role defaults", which are the most "defaulty" and lose in priority to everything. + * then "role defaults", which are the most "default-like" and lose in priority to everything. Given the above rules, here's a test that a -e variable overrides inventory, and also defaults, and role vars. diff --git a/test/integration/targets/var_blending/runme.sh b/test/integration/targets/var_blending/runme.sh index 4454e470a70..ae66fdd82ed 100755 --- a/test/integration/targets/var_blending/runme.sh +++ b/test/integration/targets/var_blending/runme.sh @@ -4,7 +4,7 @@ set -eux ansible-playbook test_var_blending.yml -i inventory -e @test_vars.yml -v "$@" -# check bad vault file erros +# check bad vault file errors [ "$(ansible-playbook error_handling.yml -i inventory --vault-password-file supersecretvaultsecret -e @vars/bad_vault.yml 2>&1 | grep -c 'dummy')" -eq "0" ] [ "$(ansible-playbook error_handling.yml -i inventory --vault-password-file supersecretvaultsecret --tags includevault 2>&1 | grep -c 'dummy')" -eq "0" ] diff --git a/test/integration/targets/win_app_control/files/New-AnsiblePowerShellSignature.ps1 b/test/integration/targets/win_app_control/files/New-AnsiblePowerShellSignature.ps1 index c9ae322e577..39da2ba8d10 100644 --- a/test/integration/targets/win_app_control/files/New-AnsiblePowerShellSignature.ps1 +++ b/test/integration/targets/win_app_control/files/New-AnsiblePowerShellSignature.ps1 @@ -47,7 +47,7 @@ Function New-AnsiblePowerShellSignature { .PARAMETER Collection The collection(s) to sign. This is set to ansible.builtin by default but - can be overriden to include other collections like ansible.windows. + can be overridden to include other collections like ansible.windows. .PARAMETER Skip A list of plugins to skip by the fully qualified name. Plugins skipped will diff --git a/test/integration/targets/win_exec_wrapper/tasks/main.yml b/test/integration/targets/win_exec_wrapper/tasks/main.yml index 22d97a560d0..086af23c3eb 100644 --- a/test/integration/targets/win_exec_wrapper/tasks/main.yml +++ b/test/integration/targets/win_exec_wrapper/tasks/main.yml @@ -50,7 +50,7 @@ register: error_module ignore_errors: yes vars: - # Running with coverage means the module is run from a script and not as a psuedo script in a pipeline. This + # Running with coverage means the module is run from a script and not as a pseudo script in a pipeline. This # results in a different error message being returned so we disable coverage collection for this task. _ansible_coverage_remote_output: '' diff --git a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/module_utils/WebRequest.psm1 b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/module_utils/WebRequest.psm1 index 649fb65ccdd..7148b4617ba 100644 --- a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/module_utils/WebRequest.psm1 +++ b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/module_utils/WebRequest.psm1 @@ -17,7 +17,7 @@ Function Get-AnsibleWindowsWebRequest { The protocol method to use, if omitted, will use the default value for the URI protocol specified. .PARAMETER FollowRedirects - Whether to follow redirect reponses. This is only valid when using a HTTP URI. + Whether to follow redirect responses. This is only valid when using a HTTP URI. all - Will follow all redirects none - Will follow no redirects safe - Will only follow redirects when GET or HEAD is used as the UrlMethod diff --git a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/modules/win_uri.ps1 b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/modules/win_uri.ps1 index 9d7c68befb7..55ae0ad22f7 100644 --- a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/modules/win_uri.ps1 +++ b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/modules/win_uri.ps1 @@ -69,7 +69,7 @@ Function ConvertFrom-SafeJson { .SYNOPSIS Safely convert a JSON string to an object, this is like ConvertFrom-Json except it respect -ErrorAction. - .PAREMTER InputObject + .PARAMETER InputObject The input object string to convert from. #> [CmdletBinding()] diff --git a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_reboot.py b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_reboot.py index ca0adcf34e9..5bab10c56e1 100644 --- a/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_reboot.py +++ b/test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/plugin_utils/_reboot.py @@ -515,7 +515,7 @@ def _perform_reboot( # Test for "A system shutdown has already been scheduled. (1190)" and handle it gracefully if handle_abort and (rc == 1190 or (rc != 0 and stderr and "(1190)" in stderr)): - display.warning("A scheduled reboot was pre-empted by Ansible.") + display.warning("A scheduled reboot was preempted by Ansible.") # Try to abort (this may fail if it was already aborted) rc, stdout, stderr = _execute_command( diff --git a/test/support/windows-integration/plugins/action/win_reboot.py b/test/support/windows-integration/plugins/action/win_reboot.py index a2dfe906e86..43fb1ef00ff 100644 --- a/test/support/windows-integration/plugins/action/win_reboot.py +++ b/test/support/windows-integration/plugins/action/win_reboot.py @@ -69,7 +69,7 @@ class ActionModule(RebootActionModule, ActionBase): stdout = reboot_result['stdout'] stderr = reboot_result['stderr'] if reboot_result['rc'] == 1190 or (reboot_result['rc'] != 0 and "(1190)" in reboot_result['stderr']): - display.warning('A scheduled reboot was pre-empted by Ansible.') + display.warning('A scheduled reboot was preempted by Ansible.') # Try to abort (this may fail if it was already aborted) result1 = self._low_level_execute_command(self._connection._shell._encode_script('shutdown /a'), diff --git a/test/support/windows-integration/plugins/modules/setup.ps1 b/test/support/windows-integration/plugins/modules/setup.ps1 index 50647239860..ca8e55e07d9 100644 --- a/test/support/windows-integration/plugins/modules/setup.ps1 +++ b/test/support/windows-integration/plugins/modules/setup.ps1 @@ -28,7 +28,7 @@ Function Get-CustomFacts { Function Get-MachineSid { # The Machine SID is stored in HKLM:\SECURITY\SAM\Domains\Account and is - # only accessible by the Local System account. This method get's the local + # only accessible by the Local System account. This method gets the local # admin account (ends with -500) and lops it off to get the machine sid. $machine_sid = $null diff --git a/test/support/windows-integration/plugins/modules/win_whoami.ps1 b/test/support/windows-integration/plugins/modules/win_whoami.ps1 index 6c9965af7e7..a0a6622bea8 100644 --- a/test/support/windows-integration/plugins/modules/win_whoami.ps1 +++ b/test/support/windows-integration/plugins/modules/win_whoami.ps1 @@ -130,7 +130,7 @@ namespace Ansible public enum SECURITY_LOGON_TYPE { - System = 0, // Used only by the Sytem account + System = 0, // Used only by the System account Interactive = 2, Network, Batch, diff --git a/test/units/_internal/templating/test_jinja_bits.py b/test/units/_internal/templating/test_jinja_bits.py index 5d918140ae4..2f0019f34f5 100644 --- a/test/units/_internal/templating/test_jinja_bits.py +++ b/test/units/_internal/templating/test_jinja_bits.py @@ -400,7 +400,7 @@ def test_builtin_alt_names(name: str) -> None: def test_macro_marker_handling(template: str, variables: dict[str, object], expected: object) -> None: """ Ensure that `JinjaCallContext` Marker handling is masked/set correctly for Jinja macro callables. - Jinja's generated macro code handles Markers, so pre-emptive raise on retrieval should be disabled for the macro `call()`. + Jinja's generated macro code handles Markers, so preemptive raise on retrieval should be disabled for the macro `call()`. """ res = TemplateEngine(variables=variables).template(TRUST.tag(template)) diff --git a/test/units/config/manager/test_find_ini_config_file.py b/test/units/config/manager/test_find_ini_config_file.py index 2fee915f852..a1bdb757fdf 100644 --- a/test/units/config/manager/test_find_ini_config_file.py +++ b/test/units/config/manager/test_find_ini_config_file.py @@ -191,7 +191,7 @@ class TestFindIniFile: assert u'Ansible is being run in a world writable directory' in warning assert u'ignoring it as an ansible.cfg source' in warning - # ANSIBLE_CONFIG is sepcified + # ANSIBLE_CONFIG is specified @pytest.mark.parametrize('setup_env, expected', (([alt_cfg_file], alt_cfg_file), ([cfg_in_cwd], cfg_in_cwd)), indirect=['setup_env']) # All config files are present @pytest.mark.parametrize('setup_existing_files', diff --git a/test/units/errors/fixtures/inputs/short_file.txt b/test/units/errors/fixtures/inputs/short_file.txt index ce467508758..497649fd07c 100644 --- a/test/units/errors/fixtures/inputs/short_file.txt +++ b/test/units/errors/fixtures/inputs/short_file.txt @@ -4,4 +4,4 @@ another line exceeding 120 chars content content content content content content yet another line exceeding 120 chars content content content content content content content content content content content content content content content content content content EOL short a line of reasonably normal length -a line of exactly 118 chars content content content content content content content content content content conten EOL +a line of exactly 118 chars content content content content content content content content content content finish EOL diff --git a/test/units/errors/fixtures/inputs/short_file_missing_trailing_newline.txt b/test/units/errors/fixtures/inputs/short_file_missing_trailing_newline.txt index 7c71b227859..75811d85307 100644 --- a/test/units/errors/fixtures/inputs/short_file_missing_trailing_newline.txt +++ b/test/units/errors/fixtures/inputs/short_file_missing_trailing_newline.txt @@ -4,4 +4,4 @@ another line exceeding 120 chars content content content content content content yet another line exceeding 120 chars content content content content content content content content content content content content content content content content content content EOL short a line of reasonably normal length -a line of exactly 118 chars content content content content content content content content content content conten EOL \ No newline at end of file +a line of exactly 118 chars content content content content content content content content content content finish EOL \ No newline at end of file diff --git a/test/units/errors/fixtures/outputs/short_file_last_column_right_marker.txt b/test/units/errors/fixtures/outputs/short_file_last_column_right_marker.txt index 76b7c37bb39..cb56ef359c6 100644 --- a/test/units/errors/fixtures/outputs/short_file_last_column_right_marker.txt +++ b/test/units/errors/fixtures/outputs/short_file_last_column_right_marker.txt @@ -1,4 +1,4 @@ 5 short 6 a line of reasonably normal length -7 a line of exactly 118 chars content content content content content content content content content content conten EOL +7 a line of exactly 118 chars content content content content content content content content content content finish EOL column 118 ^ diff --git a/test/units/errors/fixtures/outputs/short_file_missing_trailing_newline_left_marker.txt b/test/units/errors/fixtures/outputs/short_file_missing_trailing_newline_left_marker.txt index 4f66f0ca8c0..93d20a68e51 100644 --- a/test/units/errors/fixtures/outputs/short_file_missing_trailing_newline_left_marker.txt +++ b/test/units/errors/fixtures/outputs/short_file_missing_trailing_newline_left_marker.txt @@ -1,4 +1,4 @@ 5 short 6 a line of reasonably normal length -7 a line of exactly 118 chars content content content content content content content content content content conten EOL +7 a line of exactly 118 chars content content content content content content content content content content finish EOL ^ column 1 diff --git a/test/units/galaxy/test_api.py b/test/units/galaxy/test_api.py index a2dbf0b1abc..d20e5774931 100644 --- a/test/units/galaxy/test_api.py +++ b/test/units/galaxy/test_api.py @@ -858,7 +858,7 @@ def test_get_collection_versions(api_version, token_type, token_ins, monkeypatch }, { 'version': '1.0.1', - 'href': '/api/v3/plugin/ansible/content/pubished/collections/index/ns/col/versions/1.0.1/', + 'href': '/api/v3/plugin/ansible/content/published/collections/index/ns/col/versions/1.0.1/', }, ], } diff --git a/test/units/module_utils/basic/test_atomic_move.py b/test/units/module_utils/basic/test_atomic_move.py index 9e100f428cc..6cd3b0c98d3 100644 --- a/test/units/module_utils/basic/test_atomic_move.py +++ b/test/units/module_utils/basic/test_atomic_move.py @@ -135,7 +135,7 @@ def test_no_tty_fallback(atomic_am, atomic_mocks, fake_stat, mocker): @pytest.mark.parametrize('stdin', [{}], indirect=['stdin']) def test_existing_file_stat_failure(atomic_am, atomic_mocks, mocker): - """Failure to stat an existing file in order to copy permissions propogates the error (unless EPERM)""" + """Failure to stat an existing file in order to copy permissions propagates the error (unless EPERM)""" atomic_mocks['copystat'].side_effect = FileNotFoundError('testing os copystat with non EPERM error') atomic_mocks['path_exists'].return_value = True diff --git a/test/units/module_utils/basic/test_exit_json.py b/test/units/module_utils/basic/test_exit_json.py index f010e56f630..a9268bb3acb 100644 --- a/test/units/module_utils/basic/test_exit_json.py +++ b/test/units/module_utils/basic/test_exit_json.py @@ -106,8 +106,8 @@ class TestAnsibleModuleExitValuesRemoved: DATA = ( ( - dict(username='person', password='$ecret k3y'), - dict(one=1, pwd='$ecret k3y', url='https://username:password12345@foo.com/login/', + dict(username='person', password='$secret k3y'), + dict(one=1, pwd='$secret k3y', url='https://username:password12345@foo.com/login/', not_secret='following the leader', msg='here'), dict(one=1, pwd=OMIT, url='https://username:password12345@foo.com/login/', not_secret='following the leader', msg='here', @@ -115,15 +115,15 @@ class TestAnsibleModuleExitValuesRemoved: ), ( dict(username='person', password='password12345'), - dict(one=1, pwd='$ecret k3y', url='https://username:password12345@foo.com/login/', + dict(one=1, pwd='$secret k3y', url='https://username:password12345@foo.com/login/', not_secret='following the leader', msg='here'), - dict(one=1, pwd='$ecret k3y', url='https://username:********@foo.com/login/', + dict(one=1, pwd='$secret k3y', url='https://username:********@foo.com/login/', not_secret='following the leader', msg='here', invocation=dict(module_args=dict(password=OMIT, token=None, username='person'))), ), ( - dict(username='person', password='$ecret k3y'), - dict(one=1, pwd='$ecret k3y', url='https://username:$ecret k3y@foo.com/login/', + dict(username='person', password='$secret k3y'), + dict(one=1, pwd='$secret k3y', url='https://username:$secret k3y@foo.com/login/', not_secret='following the leader', msg='here'), dict(one=1, pwd=OMIT, url='https://username:********@foo.com/login/', not_secret='following the leader', msg='here', diff --git a/test/units/module_utils/facts/test_ansible_collector.py b/test/units/module_utils/facts/test_ansible_collector.py index 3293960d9f7..a7d517c6f88 100644 --- a/test/units/module_utils/facts/test_ansible_collector.py +++ b/test/units/module_utils/facts/test_ansible_collector.py @@ -65,7 +65,7 @@ ALL_COLLECTOR_CLASSES = \ EnvFactCollector, DnsFactCollector, PythonFactCollector, - # FIXME: re-enable when hardware doesnt Hardware() doesnt munge self.facts + # FIXME: re-enable when hardware doesn't Hardware() doesn't munge self.facts # HardwareCollector NetworkCollector, VirtualCollector, diff --git a/test/units/module_utils/facts/test_utils.py b/test/units/module_utils/facts/test_utils.py index 5accfe9e5ac..1fc092fb46b 100644 --- a/test/units/module_utils/facts/test_utils.py +++ b/test/units/module_utils/facts/test_utils.py @@ -32,6 +32,6 @@ class TestGetMountSize(unittest.TestCase): @patch('ansible.module_utils.facts.utils.os.statvfs', side_effect=OSError('intentionally induced os error')) def test_oserror_on_statvfs(self, mock_statvfs): - mount_info = utils.get_mount_size('/dev/null/doesnt/matter') + mount_info = utils.get_mount_size('/dev/null/does/not/matter') self.assertIsInstance(mount_info, dict) self.assertDictEqual(mount_info, {}) diff --git a/test/units/parsing/vault/test_vault_editor.py b/test/units/parsing/vault/test_vault_editor.py index 20d088609ee..b0b1781c05e 100644 --- a/test/units/parsing/vault/test_vault_editor.py +++ b/test/units/parsing/vault/test_vault_editor.py @@ -165,7 +165,7 @@ class TestVaultEditor(unittest.TestCase): tmp_path = editor_args[-1] - # simulate the tmp file being editted + # simulate the tmp file being edited with open(tmp_path, 'wb') as tmp_file: tmp_file.write(new_src_contents) @@ -399,7 +399,7 @@ class TestVaultEditor(unittest.TestCase): self.assertEqual(src_file_plaintext, new_src_contents) # self.assertEqual(src_file_plaintext, new_src_contents, - # 'The decrypted plaintext of the editted file is not the expected contents.') + # 'The decrypted plaintext of the edited file is not the expected contents.') @patch('ansible.parsing.vault.subprocess.call') def test_edit_file_not_encrypted(self, mock_sp_call): diff --git a/test/units/playbook/test_base.py b/test/units/playbook/test_base.py index a3fed9cf65f..3c4aa89dd38 100644 --- a/test/units/playbook/test_base.py +++ b/test/units/playbook/test_base.py @@ -59,7 +59,7 @@ class TestBase(unittest.TestCase): self.assertIsInstance(self.b, base.Base) self.assertIsInstance(self.b, self.ClassUnderTest) - # dump me doesnt return anything or change anything so not much to assert + # dump me doesn't return anything or change anything so not much to assert def test_dump_me_empty(self): self.b.dump_me() diff --git a/test/units/plugins/inventory/test_constructed.py b/test/units/plugins/inventory/test_constructed.py index 7bf7e882ec0..3ae9fecc9a0 100644 --- a/test/units/plugins/inventory/test_constructed.py +++ b/test/units/plugins/inventory/test_constructed.py @@ -38,7 +38,7 @@ def inventory_module(): def _trust(value): - """Recursively apply TrustedAsTemplate to input (simulating what wuold come out of a trusted input source like the dataloader YAML/JSON/ini parser)""" + """Recursively apply TrustedAsTemplate to input (simulating what would come out of a trusted input source like the dataloader YAML/JSON/ini parser)""" if isinstance(value, dict): return {_trust(k): _trust(v) for k, v in value.items()} diff --git a/test/units/utils/collection_loader/test_collection_loader.py b/test/units/utils/collection_loader/test_collection_loader.py index 9355817be3c..7c6532140b6 100644 --- a/test/units/utils/collection_loader/test_collection_loader.py +++ b/test/units/utils/collection_loader/test_collection_loader.py @@ -759,7 +759,7 @@ def test_fqcr_parsing_valid(ref, ref_type, expected_collection, ), ) def test_fqcn_validation(fqcn, expected): - """Vefiry that is_valid_collection_name validates FQCN correctly.""" + """Verify that is_valid_collection_name validates FQCN correctly.""" assert AnsibleCollectionRef.is_valid_collection_name(fqcn) is expected