diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 3159784d158..75104bb5296 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -54,7 +54,7 @@ body: Why? - We would do it by ourselves but unfortunatelly, the curent + We would do it by ourselves but unfortunately, the current edition of GitHub Issue Forms Alpha does not support this yet 🤷 diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index dd39c40de1c..89541cdec51 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -109,7 +109,7 @@ body: Why? - We would do it by ourselves but unfortunatelly, the curent + We would do it by ourselves but unfortunately, the current edition of GitHub Issue Forms Alpha does not support this yet 🤷 diff --git a/changelogs/fragments/83540-update_disto_version.yml b/changelogs/fragments/83540-update_disto_version.yml index 9de3b480cad..47141746bb6 100644 --- a/changelogs/fragments/83540-update_disto_version.yml +++ b/changelogs/fragments/83540-update_disto_version.yml @@ -1,2 +1,2 @@ bugfixes: - - disro package - update the distro package version from 1.8.0 to 1.9.0 (https://github.com/ansible/ansible/issues/82935) \ No newline at end of file + - distro package - update the distro package version from 1.8.0 to 1.9.0 (https://github.com/ansible/ansible/issues/82935) diff --git a/lib/ansible/cli/config.py b/lib/ansible/cli/config.py index e17a26f369d..da9231af74b 100755 --- a/lib/ansible/cli/config.py +++ b/lib/ansible/cli/config.py @@ -506,7 +506,7 @@ class ConfigCLI(CLI): # prep loading loader = getattr(plugin_loader, '%s_loader' % ptype) - # acumulators + # accumulators output = [] config_entries = {} @@ -523,7 +523,7 @@ class ConfigCLI(CLI): plugin_cs = loader.all(class_only=True) for plugin in plugin_cs: - # in case of deprecastion they diverge + # in case of deprecation they diverge finalname = name = plugin._load_name if name.startswith('_'): if os.path.islink(plugin._original_path): diff --git a/lib/ansible/cli/console.py b/lib/ansible/cli/console.py index 5805b97fce8..60f9cdd84a7 100755 --- a/lib/ansible/cli/console.py +++ b/lib/ansible/cli/console.py @@ -545,7 +545,7 @@ class ConsoleCLI(CLI, cmd.Cmd): if path: module_loader.add_directory(path) - # dynamically add 'cannonical' modules as commands, aliases coudld be used and dynamically loaded + # dynamically add 'canonical' modules as commands, aliases could be used and dynamically loaded self.modules = self.list_modules() for module in self.modules: setattr(self, 'do_' + module, lambda arg, module=module: self.default(module + ' ' + arg)) diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py index 4d9dfbe57d2..8a0fefa0224 100755 --- a/lib/ansible/cli/doc.py +++ b/lib/ansible/cli/doc.py @@ -50,7 +50,7 @@ PB_OBJECTS = ['Play', 'Role', 'Block', 'Task', 'Handler'] PB_LOADED = {} SNIPPETS = ['inventory', 'lookup', 'module'] -# harcoded from ascii values +# hardcoded from ascii values STYLE = { 'BLINK': '\033[5m', 'BOLD': '\033[1m', @@ -1195,7 +1195,7 @@ class DocCLI(CLI, RoleMixin): opt_leadin = "-" key = "%s%s %s" % (base_indent, opt_leadin, _format(o, 'yellow')) - # description is specifically formated and can either be string or list of strings + # description is specifically formatted and can either be string or list of strings if 'description' not in opt: raise AnsibleError("All (sub-)options and return values must have a 'description' field") text.append('') diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index edeae44f795..6fabaee0813 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -1018,7 +1018,7 @@ DEFAULT_STDOUT_CALLBACK: EDITOR: name: editor application to use default: vi - descrioption: + description: - for the cases in which Ansible needs to return a file within an editor, this chooses the application to use. ini: - section: defaults @@ -1781,7 +1781,7 @@ OLD_PLUGIN_CACHE_CLEARING: PAGER: name: pager application to use default: less - descrioption: + description: - for the cases in which Ansible needs to return output in a pageable fashion, this chooses the application to use. ini: - section: defaults diff --git a/lib/ansible/executor/interpreter_discovery.py b/lib/ansible/executor/interpreter_discovery.py index 6d105817b03..24b2174d3c8 100644 --- a/lib/ansible/executor/interpreter_discovery.py +++ b/lib/ansible/executor/interpreter_discovery.py @@ -41,7 +41,7 @@ class InterpreterDiscoveryRequiredError(Exception): def discover_interpreter(action, interpreter_name, discovery_mode, task_vars): # interpreter discovery is a 2-step process with the target. First, we use a simple shell-agnostic bootstrap to # get the system type from uname, and find any random Python that can get us the info we need. For supported - # target OS types, we'll dispatch a Python script that calls plaform.dist() (for older platforms, where available) + # target OS types, we'll dispatch a Python script that calls platform.dist() (for older platforms, where available) # and brings back /etc/os-release (if present). The proper Python path is looked up in a table of known # distros/versions with included Pythons; if nothing is found, depending on the discovery mode, either the # default fallback of /usr/bin/python is used (if we know it's there), or discovery fails. diff --git a/lib/ansible/executor/powershell/exec_wrapper.ps1 b/lib/ansible/executor/powershell/exec_wrapper.ps1 index cce99abc77f..4ecc1367c84 100644 --- a/lib/ansible/executor/powershell/exec_wrapper.ps1 +++ b/lib/ansible/executor/powershell/exec_wrapper.ps1 @@ -16,7 +16,7 @@ begin { .SYNOPSIS Converts a JSON string to a Hashtable/Array in the fastest way possible. Unfortunately ConvertFrom-Json is still faster but outputs - a PSCustomObject which is combersone for module consumption. + a PSCustomObject which is cumbersome for module consumption. .PARAMETER InputObject [String] The JSON string to deserialize. diff --git a/lib/ansible/executor/task_queue_manager.py b/lib/ansible/executor/task_queue_manager.py index f6e8c8bf7e0..3b9e251da81 100644 --- a/lib/ansible/executor/task_queue_manager.py +++ b/lib/ansible/executor/task_queue_manager.py @@ -223,7 +223,7 @@ class TaskQueueManager: callback_type = getattr(callback_plugin, 'CALLBACK_TYPE', '') callback_needs_enabled = getattr(callback_plugin, 'CALLBACK_NEEDS_ENABLED', getattr(callback_plugin, 'CALLBACK_NEEDS_WHITELIST', False)) - # try to get colleciotn world name first + # try to get collection world name first cnames = getattr(callback_plugin, '_redirected_names', []) if cnames: # store the name the plugin was loaded as, as that's what we'll need to compare to the configured callback list later diff --git a/lib/ansible/executor/task_result.py b/lib/ansible/executor/task_result.py index 2690f3a52bb..821189367d1 100644 --- a/lib/ansible/executor/task_result.py +++ b/lib/ansible/executor/task_result.py @@ -139,7 +139,7 @@ class TaskResult: elif self._result: result._result = module_response_deepcopy(self._result) - # actualy remove + # actually remove for remove_key in ignore: if remove_key in result._result: del result._result[remove_key] diff --git a/lib/ansible/galaxy/collection/concrete_artifact_manager.py b/lib/ansible/galaxy/collection/concrete_artifact_manager.py index a67138fd2f4..06c1cf6f93b 100644 --- a/lib/ansible/galaxy/collection/concrete_artifact_manager.py +++ b/lib/ansible/galaxy/collection/concrete_artifact_manager.py @@ -61,7 +61,7 @@ class ConcreteArtifactsManager: """ def __init__(self, b_working_directory, validate_certs=True, keyring=None, timeout=60, required_signature_count=None, ignore_signature_errors=None): # type: (bytes, bool, str, int, str, list[str]) -> None - """Initialize ConcreteArtifactsManager caches and costraints.""" + """Initialize ConcreteArtifactsManager caches and constraints.""" self._validate_certs = validate_certs # type: bool self._artifact_cache = {} # type: dict[bytes, bytes] self._galaxy_artifact_cache = {} # type: dict[Candidate | Requirement, bytes] diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py index 716f5423b37..7578cae785c 100644 --- a/lib/ansible/galaxy/dependency_resolution/providers.py +++ b/lib/ansible/galaxy/dependency_resolution/providers.py @@ -126,7 +126,7 @@ class CollectionDependencyProviderBase(AbstractProvider): the current candidate list * ``parent`` specifies the candidate that provides - (dependend on) the requirement, or `None` + (depended on) the requirement, or `None` to indicate a root requirement. resolvelib >=0.7.0, < 0.8.0 @@ -202,7 +202,7 @@ class CollectionDependencyProviderBase(AbstractProvider): remote archives), the one-and-only match is returned For a "named" requirement, Galaxy-compatible APIs are consulted - to find concrete candidates for this requirement. Of theres a + to find concrete candidates for this requirement. If there's a pre-installed candidate, it's prepended in front of others. resolvelib >=0.5.3, <0.6.0 @@ -437,7 +437,7 @@ class CollectionDependencyProviderBase(AbstractProvider): # FIXME: differs. So how do we resolve this case? Priority? # FIXME: Taking into account a pinned hash? Exploding on # FIXME: any differences? - # NOTE: The underlying implmentation currently uses first found + # NOTE: The underlying implementation currently uses first found req_map = self._api_proxy.get_collection_dependencies(candidate) # NOTE: This guard expression MUST perform an early exit only diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py index 154b081c78a..e8f19e68c58 100644 --- a/lib/ansible/module_utils/basic.py +++ b/lib/ansible/module_utils/basic.py @@ -1431,7 +1431,7 @@ class AnsibleModule(object): kwargs['deprecations'] = deprecations # preserve bools/none from no_log - # TODO: once python version on target high enough, dict comprh + # TODO: once python version on target high enough, dict comprehensions preserved = {} for k, v in kwargs.items(): if v is None or isinstance(v, bool): diff --git a/lib/ansible/module_utils/common/collections.py b/lib/ansible/module_utils/common/collections.py index e4cb9ec1d70..28c53e14e2c 100644 --- a/lib/ansible/module_utils/common/collections.py +++ b/lib/ansible/module_utils/common/collections.py @@ -65,7 +65,7 @@ class ImmutableDict(Hashable, Mapping): def is_string(seq): - """Identify whether the input has a string-like type (inclding bytes).""" + """Identify whether the input has a string-like type (including bytes).""" # AnsibleVaultEncryptedUnicode inherits from Sequence, but is expected to be a string like object return isinstance(seq, (text_type, binary_type)) or getattr(seq, '__ENCRYPTED__', False) diff --git a/lib/ansible/module_utils/facts/hardware/openbsd.py b/lib/ansible/module_utils/facts/hardware/openbsd.py index f6765422536..b5f08c0092b 100644 --- a/lib/ansible/module_utils/facts/hardware/openbsd.py +++ b/lib/ansible/module_utils/facts/hardware/openbsd.py @@ -54,7 +54,7 @@ class OpenBSDHardware(Hardware): hardware_facts.update(self.get_dmi_facts()) hardware_facts.update(self.get_uptime_facts()) - # storage devices notorioslly prone to hang/block so they are under a timeout + # storage devices notoriously prone to hang/block so they are under a timeout try: hardware_facts.update(self.get_mount_facts()) except timeout.TimeoutError: diff --git a/lib/ansible/module_utils/facts/network/hpux.py b/lib/ansible/module_utils/facts/network/hpux.py index 5c8905a2763..2f01825bb24 100644 --- a/lib/ansible/module_utils/facts/network/hpux.py +++ b/lib/ansible/module_utils/facts/network/hpux.py @@ -20,7 +20,7 @@ from ansible.module_utils.facts.network.base import Network, NetworkCollector class HPUXNetwork(Network): """ - HP-UX-specifig subclass of Network. Defines networking facts: + HP-UX-specific subclass of Network. Defines networking facts: - default_interface - interfaces (a list of interface names) - interface_ dictionary of ipv4 address information. diff --git a/lib/ansible/module_utils/facts/system/service_mgr.py b/lib/ansible/module_utils/facts/system/service_mgr.py index 0d5462fdd62..20257967c1e 100644 --- a/lib/ansible/module_utils/facts/system/service_mgr.py +++ b/lib/ansible/module_utils/facts/system/service_mgr.py @@ -106,7 +106,7 @@ class ServiceMgrFactCollector(BaseFactCollector): proc_1 = proc_1.strip() if proc_1 is not None and (proc_1 == 'init' or proc_1.endswith('sh')): - # many systems return init, so this cannot be trusted, if it ends in 'sh' it probalby is a shell in a container + # many systems return init, so this cannot be trusted, if it ends in 'sh' it probably is a shell in a container proc_1 = None # if not init/None it should be an identifiable or custom init, so we are done! diff --git a/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.AddType.psm1 b/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.AddType.psm1 index b18a9a1729b..3a1a317ec66 100644 --- a/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.AddType.psm1 +++ b/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.AddType.psm1 @@ -37,7 +37,7 @@ Function Add-CSharpType { .PARAMETER CompileSymbols [String[]] A list of symbols to be defined during compile time. These are added to the existing symbols, 'CORECLR', 'WINDOWS', 'UNIX' that are set - conditionalls in this cmdlet. + conditionals in this cmdlet. .NOTES The following features were added to control the compiling options from the diff --git a/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.CamelConversion.psm1 b/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.CamelConversion.psm1 index 9b86f84188a..fb9fb11c490 100644 --- a/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.CamelConversion.psm1 +++ b/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.CamelConversion.psm1 @@ -4,7 +4,7 @@ # used by Convert-DictToSnakeCase to convert a string in camelCase # format to snake_case Function Convert-StringToSnakeCase($string) { - # cope with pluralized abbreaviations such as TargetGroupARNs + # cope with pluralized abbreviations such as TargetGroupARNs if ($string -cmatch "[A-Z]{3,}s") { $replacement_string = $string -creplace $matches[0], "_$($matches[0].ToLower())" diff --git a/lib/ansible/module_utils/splitter.py b/lib/ansible/module_utils/splitter.py index 7bddd32dae1..e2a3da50543 100644 --- a/lib/ansible/module_utils/splitter.py +++ b/lib/ansible/module_utils/splitter.py @@ -81,7 +81,7 @@ def split_args(args): ''' # the list of params parsed out of the arg string - # this is going to be the result value when we are donei + # this is going to be the result value when we are done params = [] # here we encode the args, so we have a uniform charset to diff --git a/lib/ansible/modules/apt.py b/lib/ansible/modules/apt.py index fa22d905351..70a2a07cc07 100644 --- a/lib/ansible/modules/apt.py +++ b/lib/ansible/modules/apt.py @@ -507,7 +507,7 @@ def package_best_match(pkgname, version_cmp, version, release, cache): policy.create_pin('Release', pkgname, release, 990) if version_cmp == "=": # Installing a specific version from command line overrides all pinning - # We don't mimmic this exactly, but instead set a priority which is higher than all APT built-in pin priorities. + # We don't mimic this exactly, but instead set a priority which is higher than all APT built-in pin priorities. policy.create_pin('Version', pkgname, version, 1001) pkg = cache[pkgname] pkgver = policy.get_candidate_ver(pkg) diff --git a/lib/ansible/modules/git.py b/lib/ansible/modules/git.py index 747acf0f1ba..c9ccff4bfc8 100644 --- a/lib/ansible/modules/git.py +++ b/lib/ansible/modules/git.py @@ -468,7 +468,7 @@ def write_ssh_wrapper(module): def set_git_ssh_env(key_file, ssh_opts, git_version, module): ''' use environment variables to configure git's ssh execution, - which varies by version but this functino should handle all. + which varies by version but this function should handle all. ''' # initialise to existing ssh opts and/or append user provided diff --git a/lib/ansible/modules/hostname.py b/lib/ansible/modules/hostname.py index 7fe04ad82d8..4b2ee682f2e 100644 --- a/lib/ansible/modules/hostname.py +++ b/lib/ansible/modules/hostname.py @@ -516,7 +516,7 @@ class DarwinStrategy(BaseStrategy): However, macOS also has LocalHostName and ComputerName settings. LocalHostName controls the Bonjour/ZeroConf name, used by services like AirDrop. This class implements a method, _scrub_hostname(), that mimics - the transformations macOS makes on hostnames when enterened in the Sharing + the transformations macOS makes on hostnames when entered in the Sharing preference pane. It replaces spaces with dashes and removes all special characters. diff --git a/lib/ansible/modules/sysvinit.py b/lib/ansible/modules/sysvinit.py index 69b00accdbf..8788162819e 100644 --- a/lib/ansible/modules/sysvinit.py +++ b/lib/ansible/modules/sysvinit.py @@ -203,7 +203,7 @@ def main(): worked = is_started = get_ps(module, pattern) else: if location.get('service'): - # standard tool that has been 'destandarized' by reimplementation in other OS/distros + # standard tool that has been 'destandardized' by reimplementation in other OS/distros cmd = '%s %s status' % (location['service'], name) elif script: # maybe script implements status (not LSB) diff --git a/lib/ansible/modules/user.py b/lib/ansible/modules/user.py index 1e8aa830bf9..8cf27b37b2d 100644 --- a/lib/ansible/modules/user.py +++ b/lib/ansible/modules/user.py @@ -2331,7 +2331,7 @@ class DarwinUser(User): super(DarwinUser, self).__init__(module) - # make the user hidden if option is set or deffer to system option + # make the user hidden if option is set or defer to system option if self.hidden is None: if self.system: self.hidden = 1 diff --git a/lib/ansible/parsing/yaml/objects.py b/lib/ansible/parsing/yaml/objects.py index b6a8e9a5681..6ec4850b192 100644 --- a/lib/ansible/parsing/yaml/objects.py +++ b/lib/ansible/parsing/yaml/objects.py @@ -122,7 +122,7 @@ class AnsibleVaultEncryptedUnicode(Sequence, AnsibleBaseYAMLObject): return True def __reversed__(self): - # This gets inerhited from ``collections.Sequence`` which returns a generator + # This gets inherited from ``collections.Sequence`` which returns a generator # make this act more like the string implementation return to_text(self[::-1], errors='surrogate_or_strict') diff --git a/lib/ansible/playbook/playbook_include.py b/lib/ansible/playbook/playbook_include.py index 613f93995aa..8f1e03d7e78 100644 --- a/lib/ansible/playbook/playbook_include.py +++ b/lib/ansible/playbook/playbook_include.py @@ -90,7 +90,7 @@ class PlaybookInclude(Base, Conditional, Taggable): # it is a collection playbook, setup default collections AnsibleCollectionConfig.default_collection = playbook_collection else: - # it is NOT a collection playbook, setup adjecent paths + # it is NOT a collection playbook, setup adjacent paths AnsibleCollectionConfig.playbook_paths.append(os.path.dirname(os.path.abspath(to_bytes(playbook, errors='surrogate_or_strict')))) pb._load_playbook_data(file_name=playbook, variable_manager=variable_manager, vars=self.vars.copy()) @@ -123,7 +123,7 @@ class PlaybookInclude(Base, Conditional, Taggable): def preprocess_data(self, ds): ''' - Regorganizes the data for a PlaybookInclude datastructure to line + Reorganizes the data for a PlaybookInclude datastructure to line up with what we expect the proper attributes to be ''' diff --git a/lib/ansible/playbook/role/__init__.py b/lib/ansible/playbook/role/__init__.py index 1c82e5335c4..c37f4be6dbe 100644 --- a/lib/ansible/playbook/role/__init__.py +++ b/lib/ansible/playbook/role/__init__.py @@ -107,7 +107,7 @@ class Role(Base, Conditional, Taggable, CollectionSearch, Delegatable): self.static = static # includes (static=false) default to private, while imports (static=true) default to public - # but both can be overriden by global config if set + # but both can be overridden by global config if set if public is None: global_private, origin = C.config.get_config_value_and_origin('DEFAULT_PRIVATE_ROLE_VARS') if origin == 'default': @@ -508,7 +508,7 @@ class Role(Base, Conditional, Taggable, CollectionSearch, Delegatable): # get exported variables from meta/dependencies seen = [] for dep in self.get_all_dependencies(): - # Avoid reruning dupe deps since they can have vars from previous invocations and they accumulate in deps + # Avoid rerunning dupe deps since they can have vars from previous invocations and they accumulate in deps # TODO: re-examine dep loading to see if we are somehow improperly adding the same dep too many times if dep not in seen: # only take 'exportable' vars from deps diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index 4177d6bad6f..de0f58a96b2 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -146,7 +146,7 @@ class ActionBase(ABC): Be cautious when directly passing ``new_module_args`` directly to a module invocation, as it will contain the defaults, and not only the args supplied from the task. If you do this, the module - should not define ``mututally_exclusive`` or similar. + should not define ``mutually_exclusive`` or similar. This code is roughly copied from the ``validate_argument_spec`` action plugin for use by other action plugins. diff --git a/lib/ansible/plugins/cliconf/__init__.py b/lib/ansible/plugins/cliconf/__init__.py index 9befd36f332..6bbc8f850ef 100644 --- a/lib/ansible/plugins/cliconf/__init__.py +++ b/lib/ansible/plugins/cliconf/__init__.py @@ -263,7 +263,7 @@ class CliconfBase(AnsiblePlugin): 'supports_commit_comment': , # identify if adding comment to commit is supported of not 'supports_onbox_diff': , # identify if on box diff capability is supported or not 'supports_generate_diff': , # identify if diff capability is supported within plugin - 'supports_multiline_delimiter': , # identify if multiline demiliter is supported within config + 'supports_multiline_delimiter': , # identify if multiline delimiter is supported within config 'supports_diff_match': , # identify if match is supported 'supports_diff_ignore_lines': , # identify if ignore line in diff is supported 'supports_config_replace': , # identify if running config replace with candidate config is supported diff --git a/lib/ansible/plugins/connection/psrp.py b/lib/ansible/plugins/connection/psrp.py index b69a1d80f0e..c9895d4450c 100644 --- a/lib/ansible/plugins/connection/psrp.py +++ b/lib/ansible/plugins/connection/psrp.py @@ -346,7 +346,7 @@ class Connection(ConnectionBase): has_pipelining = True allow_extras = True - # Satifies mypy as this connection only ever runs with this plugin + # Satisfies mypy as this connection only ever runs with this plugin _shell: PowerShellPlugin def __init__(self, *args: t.Any, **kwargs: t.Any) -> None: diff --git a/lib/ansible/plugins/filter/strftime.yml b/lib/ansible/plugins/filter/strftime.yml index 972072948a9..fffa6d447d1 100644 --- a/lib/ansible/plugins/filter/strftime.yml +++ b/lib/ansible/plugins/filter/strftime.yml @@ -3,7 +3,7 @@ DOCUMENTATION: version_added: "2.4" short_description: date formating description: - - Using Python's C(strftime) function, take a data formating string and a date/time to create a formated date. + - Using Python's C(strftime) function, take a data formating string and a date/time to create a formatted date. notes: - This is a passthrough to Python's C(stftime), for a complete set of formatting options go to https://strftime.org/. positional: _input, second, utc diff --git a/lib/ansible/plugins/filter/to_uuid.yml b/lib/ansible/plugins/filter/to_uuid.yml index 266bf05fca6..50824779dad 100644 --- a/lib/ansible/plugins/filter/to_uuid.yml +++ b/lib/ansible/plugins/filter/to_uuid.yml @@ -3,7 +3,7 @@ DOCUMENTATION: version_added: "2.9" short_description: namespaced UUID generator description: - - Use to generate namespeced Universal Unique ID. + - Use to generate namespaced Universal Unique ID. positional: _input, namespace options: _input: diff --git a/lib/ansible/plugins/inventory/script.py b/lib/ansible/plugins/inventory/script.py index d3bfc8e83ae..9b4c316ebdd 100644 --- a/lib/ansible/plugins/inventory/script.py +++ b/lib/ansible/plugins/inventory/script.py @@ -130,7 +130,7 @@ EXAMPLES = r'''# fmt: code mandatory_options = arg_parser.add_mutually_exclusive_group() mandatory_options.add_argument('--list', action='store', nargs="*", help="Get inventory JSON from our API") mandatory_options.add_argument('--host', action='store', - help="Get variables for specific host, not used but kept for compatability") + help="Get variables for specific host, not used but kept for compatibility") try: config = load_config() diff --git a/lib/ansible/plugins/list.py b/lib/ansible/plugins/list.py index 18cbd4586ed..96f1b0f31d5 100644 --- a/lib/ansible/plugins/list.py +++ b/lib/ansible/plugins/list.py @@ -84,7 +84,7 @@ def _list_plugins_from_paths(ptype, dirs, collection, depth=0): to_native(b_ext) in C.REJECT_EXTS, # general extensions to ignore b_ext in (b'.yml', b'.yaml', b'.json'), # ignore docs files TODO: constant! plugin in IGNORE.get(bkey, ()), # plugin in reject list - os.path.islink(full_path), # skip aliases, author should document in 'aliaes' field + os.path.islink(full_path), # skip aliases, author should document in 'aliases' field ]): continue diff --git a/lib/ansible/plugins/lookup/config.py b/lib/ansible/plugins/lookup/config.py index 4c6b000b64b..093c1a50036 100644 --- a/lib/ansible/plugins/lookup/config.py +++ b/lib/ansible/plugins/lookup/config.py @@ -8,7 +8,7 @@ DOCUMENTATION = """ version_added: "2.5" short_description: Display the 'resolved' Ansible option values. description: - - Retrieves the value of an Ansible configuration setting, resolving all sources, from defaults, ansible.cfg, envirionmnet, + - Retrieves the value of an Ansible configuration setting, resolving all sources, from defaults, ansible.cfg, environment, CLI, and variables, but not keywords. - The values returned assume the context of the current host or C(inventory_hostname). - You can use C(ansible-config list) to see the global available settings, add C(-t all) to also show plugin options. diff --git a/lib/ansible/plugins/shell/__init__.py b/lib/ansible/plugins/shell/__init__.py index 19365d38d2e..1da3b1f6d10 100644 --- a/lib/ansible/plugins/shell/__init__.py +++ b/lib/ansible/plugins/shell/__init__.py @@ -129,7 +129,7 @@ class ShellBase(AnsiblePlugin): # other users can read and access the tmp directory. # This is because we use system to create tmp dirs for unprivileged users who are # sudo'ing to a second unprivileged user. - # The 'system_tmpdirs' setting defines dirctories we can use for this purpose + # The 'system_tmpdirs' setting defines directories we can use for this purpose # the default are, /tmp and /var/tmp. # So we only allow one of those locations if system=True, using the # passed in tmpdir if it is valid or the first one from the setting if not. diff --git a/lib/ansible/plugins/strategy/__init__.py b/lib/ansible/plugins/strategy/__init__.py index c2ef9048237..481009b8df9 100644 --- a/lib/ansible/plugins/strategy/__init__.py +++ b/lib/ansible/plugins/strategy/__init__.py @@ -646,7 +646,7 @@ class StrategyBase: for result_item in result_items: if '_ansible_notify' in result_item and task_result.is_changed(): # only ensure that notified handlers exist, if so save the notifications for when - # handlers are actually flushed so the last defined handlers are exexcuted, + # handlers are actually flushed so the last defined handlers are executed, # otherwise depending on the setting either error or warn host_state = iterator.get_state_for_host(original_host.name) for notification in result_item['_ansible_notify']: diff --git a/lib/ansible/template/__init__.py b/lib/ansible/template/__init__.py index a42e5ce14ba..e23b3c5f5c9 100644 --- a/lib/ansible/template/__init__.py +++ b/lib/ansible/template/__init__.py @@ -469,7 +469,7 @@ class JinjaPluginIntercept(MutableMapping): if self._pluginloader.type == 'filter': # filter need wrapping if key in C.STRING_TYPE_FILTERS: - # avoid litera_eval when you WANT strings + # avoid literal_eval when you WANT strings func = _wrap_native_text(func) else: # conditionally unroll iterators/generators to avoid having to use `|list` after every filter diff --git a/test/integration/targets/ansible-galaxy-collection/tasks/fail_fast_resolvelib.yml b/test/integration/targets/ansible-galaxy-collection/tasks/fail_fast_resolvelib.yml index d861cb4d008..f0c94629f10 100644 --- a/test/integration/targets/ansible-galaxy-collection/tasks/fail_fast_resolvelib.yml +++ b/test/integration/targets/ansible-galaxy-collection/tasks/fail_fast_resolvelib.yml @@ -7,7 +7,7 @@ dest: "{{ galaxy_dir }}/resolvelib/ns/coll" state: directory - - name: create galaxy.yml with a dependecy on a galaxy-sourced collection + - name: create galaxy.yml with a dependency on a galaxy-sourced collection copy: dest: "{{ galaxy_dir }}/resolvelib/ns/coll/galaxy.yml" content: | diff --git a/test/integration/targets/ansible-galaxy-collection/tasks/verify.yml b/test/integration/targets/ansible-galaxy-collection/tasks/verify.yml index 2ad9c832172..9dda1b71b53 100644 --- a/test/integration/targets/ansible-galaxy-collection/tasks/verify.yml +++ b/test/integration/targets/ansible-galaxy-collection/tasks/verify.yml @@ -153,7 +153,7 @@ that: - "updated_file.stat.checksum != file.stat.checksum" -- name: test verifying checksumes of the modified collection +- name: test verifying checksums of the modified collection command: ansible-galaxy collection verify ansible_test.verify:2.0.0 -s {{ test_name }} {{ galaxy_verbosity }} register: verify failed_when: verify.rc == 0 diff --git a/test/integration/targets/ansible-galaxy-collection/tasks/virtual_direct_requests.yml b/test/integration/targets/ansible-galaxy-collection/tasks/virtual_direct_requests.yml index 7b1931f0cc1..742d7943ad7 100644 --- a/test/integration/targets/ansible-galaxy-collection/tasks/virtual_direct_requests.yml +++ b/test/integration/targets/ansible-galaxy-collection/tasks/virtual_direct_requests.yml @@ -31,7 +31,7 @@ - name: Initialize git repository command: 'git init {{ scm_path }}/test_prereleases' - - name: Configure commiter for the repo + - name: Configure committer for the repo shell: git config user.email ansible-test@ansible.com && git config user.name ansible-test args: chdir: "{{ scm_path }}/test_prereleases" diff --git a/test/integration/targets/ansible-pull/pull-integration-test/local.yml b/test/integration/targets/ansible-pull/pull-integration-test/local.yml index d358ee86863..8b5953e7f34 100644 --- a/test/integration/targets/ansible-pull/pull-integration-test/local.yml +++ b/test/integration/targets/ansible-pull/pull-integration-test/local.yml @@ -13,7 +13,7 @@ - name: final task, has to be reached for the test to succeed debug: msg="MAGICKEYWORD" - - name: check that extra vars are correclty passed + - name: check that extra vars are correctly passed assert: that: - docker_registries_login is defined diff --git a/test/integration/targets/apt_key/tasks/apt_key_inline_data.yml b/test/integration/targets/apt_key/tasks/apt_key_inline_data.yml index 916fa5ae76d..1558eac31a1 100644 --- a/test/integration/targets/apt_key/tasks/apt_key_inline_data.yml +++ b/test/integration/targets/apt_key/tasks/apt_key_inline_data.yml @@ -1,4 +1,4 @@ -- name: "Ensure import of a deliberately corrupted downloaded GnuPG binary key results in an 'inline data' occurence in the message" +- name: "Ensure import of a deliberately corrupted downloaded GnuPG binary key results in an 'inline data' occurrence in the message" apt_key: url: https://ci-files.testing.ansible.com/test/integration/targets/apt_key/apt-key-corrupt-zeros-2k.gpg register: gpg_inline_result diff --git a/test/integration/targets/apt_repository/tasks/mode.yaml b/test/integration/targets/apt_repository/tasks/mode.yaml index 4b4fabf3c67..fd29cf30fa0 100644 --- a/test/integration/targets/apt_repository/tasks/mode.yaml +++ b/test/integration/targets/apt_repository/tasks/mode.yaml @@ -123,12 +123,12 @@ # a literal 600 as the mode will fail currently, in the sense that it # doesn't guess and consider 600 and 0600 to be the same, and will instead -# intepret literal 600 as the decimal 600 (and thereby octal 1130). +# interpret literal 600 as the decimal 600 (and thereby octal 1130). # The literal 0600 can be interpreted as octal correctly. Note that -# a decimal 644 is octal 420. The default perm is 0644 so a mis intrpretation +# 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 -# to determine that. Note that a string arg of '600' will be intrepeted as 0600. +# 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 assert: diff --git a/test/integration/targets/assert/runme.sh b/test/integration/targets/assert/runme.sh index ca0a8587264..542e43959d1 100755 --- a/test/integration/targets/assert/runme.sh +++ b/test/integration/targets/assert/runme.sh @@ -25,7 +25,7 @@ run_test() { sed -i -e 's/ *$//' "${OUTFILE}.${testname}.stdout" sed -i -e 's/ *$//' "${OUTFILE}.${testname}.stderr" - # Scrub deprication warning that shows up in Python 2.6 on CentOS 6 + # Scrub deprecation warning that shows up in Python 2.6 on CentOS 6 sed -i -e '/RandomPool_DeprecationWarning/d' "${OUTFILE}.${testname}.stderr" diff -u "${ORIGFILE}.${testname}.stdout" "${OUTFILE}.${testname}.stdout" || diff_failure diff --git a/test/integration/targets/async_fail/action_plugins/normal.py b/test/integration/targets/async_fail/action_plugins/normal.py index a288290ba2c..22e2a3faeea 100644 --- a/test/integration/targets/async_fail/action_plugins/normal.py +++ b/test/integration/targets/async_fail/action_plugins/normal.py @@ -52,7 +52,7 @@ class ActionModule(ActionBase): # Simulate a transient network failure if self._task.action == 'async_status' and 'finished' in result and result['finished'] != 1: - raise AnsibleError('Pretend to fail somewher ein executing async_status') + raise AnsibleError('Pretend to fail somewhere in executing async_status') if not wrap_async: # remove a temporary path we created diff --git a/test/integration/targets/blockinfile/tasks/add_block_to_existing_file.yml b/test/integration/targets/blockinfile/tasks/add_block_to_existing_file.yml index c610905cdf1..afaef2b2be5 100644 --- a/test/integration/targets/blockinfile/tasks/add_block_to_existing_file.yml +++ b/test/integration/targets/blockinfile/tasks/add_block_to_existing_file.yml @@ -12,7 +12,7 @@ backup: yes register: blockinfile_test0 -- name: ensure we have a bcackup file +- name: ensure we have a backup file assert: that: - "'backup_file' in blockinfile_test0" @@ -38,7 +38,7 @@ - 'blockinfile_test0.msg == "Block inserted"' - 'blockinfile_test0_grep.stdout == "2"' -- name: check idemptotence +- name: check idempotence blockinfile: path: "{{ remote_tmp_dir_test }}/sshd_config" block: | diff --git a/test/integration/targets/blocks/issue71306.yml b/test/integration/targets/blocks/issue71306.yml index 9762f6ee838..049145eab0a 100644 --- a/test/integration/targets/blocks/issue71306.yml +++ b/test/integration/targets/blocks/issue71306.yml @@ -13,4 +13,4 @@ run_once: true rescue: - debug: - msg: "Attemp 1 failed!" + msg: "Attempt 1 failed!" diff --git a/test/integration/targets/callback_results/runme.sh b/test/integration/targets/callback_results/runme.sh index fe3a0a6a34a..f43b43c6832 100755 --- a/test/integration/targets/callback_results/runme.sh +++ b/test/integration/targets/callback_results/runme.sh @@ -16,7 +16,7 @@ grep -e "${EXPECTED_REGEX}" "${OUTFILE}" # test connection tracking EXPECTED_CONNECTION='{"testhost":{"ssh":4}}' OUTPUT_TAIL=$(tail -n5 ${OUTFILE} | tr -d '[:space:]') -echo "Checking for connection strin ${OUTPUT_TAIL} in stdout." +echo "Checking for connection string ${OUTPUT_TAIL} in stdout." [ "${EXPECTED_CONNECTION}" == "${OUTPUT_TAIL}" ] echo $? diff --git a/test/integration/targets/check_mode/check_mode-not-on-cli.yml b/test/integration/targets/check_mode/check_mode-not-on-cli.yml index 1b0c734b98b..d4573b52b87 100644 --- a/test/integration/targets/check_mode/check_mode-not-on-cli.yml +++ b/test/integration/targets/check_mode/check_mode-not-on-cli.yml @@ -1,5 +1,5 @@ --- -# Run withhout --check +# Run without --check - hosts: testhost gather_facts: False tasks: diff --git a/test/integration/targets/connection_ssh/check_ssh_defaults.yml b/test/integration/targets/connection_ssh/check_ssh_defaults.yml index 937f1f7d44c..1732675a628 100644 --- a/test/integration/targets/connection_ssh/check_ssh_defaults.yml +++ b/test/integration/targets/connection_ssh/check_ssh_defaults.yml @@ -4,7 +4,7 @@ ansible_connection: ssh ansible_ssh_timeout: 10 tasks: - - name: contain the maddness + - name: contain the madness block: - name: test all is good ping: @@ -16,7 +16,7 @@ ping: ignore_unreachable: True vars: - ansible_ssh_args: "-F {{playbook_dir}}/files/port_overrride_ssh.cfg" + ansible_ssh_args: "-F {{playbook_dir}}/files/port_override_ssh.cfg" register: expected - name: check all is as expected diff --git a/test/integration/targets/connection_ssh/files/port_overrride_ssh.cfg b/test/integration/targets/connection_ssh/files/port_override_ssh.cfg similarity index 100% rename from test/integration/targets/connection_ssh/files/port_overrride_ssh.cfg rename to test/integration/targets/connection_ssh/files/port_override_ssh.cfg diff --git a/test/integration/targets/copy/tasks/check_mode.yml b/test/integration/targets/copy/tasks/check_mode.yml index 9702e07089a..29b176963bc 100644 --- a/test/integration/targets/copy/tasks/check_mode.yml +++ b/test/integration/targets/copy/tasks/check_mode.yml @@ -36,7 +36,7 @@ - check_mode_subdir_real_stat.stat.exists # Do some finagling here. First, use check_mode to ensure it never gets - # created. Then actualy create it, and use check_mode to ensure that doing + # created. Then actually create it, and use check_mode to ensure that doing # the same copy gets marked as no change. # # This same pattern repeats for several other src/dest combinations. diff --git a/test/integration/targets/delegate_to/delegate_vars_hanldling.yml b/test/integration/targets/delegate_to/delegate_vars_handling.yml similarity index 98% rename from test/integration/targets/delegate_to/delegate_vars_hanldling.yml rename to test/integration/targets/delegate_to/delegate_vars_handling.yml index 6ac64e9ced9..13860a910c9 100644 --- a/test/integration/targets/delegate_to/delegate_vars_hanldling.yml +++ b/test/integration/targets/delegate_to/delegate_vars_handling.yml @@ -1,4 +1,4 @@ -- name: setup delegated hsot +- name: setup delegated host hosts: localhost gather_facts: false tasks: diff --git a/test/integration/targets/delegate_to/runme.sh b/test/integration/targets/delegate_to/runme.sh index e0dcc746aa5..ce5a607d25f 100755 --- a/test/integration/targets/delegate_to/runme.sh +++ b/test/integration/targets/delegate_to/runme.sh @@ -57,7 +57,7 @@ ansible-playbook delegate_facts_block.yml -i inventory -v "$@" ansible-playbook test_delegate_to_loop_caching.yml -i inventory -v "$@" # ensure we are using correct settings when delegating -ANSIBLE_TIMEOUT=3 ansible-playbook delegate_vars_hanldling.yml -i inventory -v "$@" +ANSIBLE_TIMEOUT=3 ansible-playbook delegate_vars_handling.yml -i inventory -v "$@" ansible-playbook has_hostvars.yml -i inventory -v "$@" diff --git a/test/integration/targets/delegate_to/test_delegate_to_loop_randomness.yml b/test/integration/targets/delegate_to/test_delegate_to_loop_randomness.yml index 81033a16a00..9669469d0e6 100644 --- a/test/integration/targets/delegate_to/test_delegate_to_loop_randomness.yml +++ b/test/integration/targets/delegate_to/test_delegate_to_loop_randomness.yml @@ -11,7 +11,7 @@ ansible_python_interpreter: "{{ ansible_playbook_python }}" loop: "{{ range(10)|list }}" - # We expect all of the next 3 runs to succeeed + # We expect all of the next 3 runs to succeed # this is done multiple times to increase randomness - assert: that: diff --git a/test/integration/targets/fetch/injection/library/slurp.py b/test/integration/targets/fetch/injection/library/slurp.py index 1fcd5c25043..5a1ccb23c5e 100644 --- a/test/integration/targets/fetch/injection/library/slurp.py +++ b/test/integration/targets/fetch/injection/library/slurp.py @@ -4,7 +4,7 @@ from __future__ import annotations DOCUMENTATION = """ module: fakeslurp - short_desciptoin: fake slurp module + short_description: fake slurp module description: - this is a fake slurp module options: diff --git a/test/integration/targets/fetch/runme.sh b/test/integration/targets/fetch/runme.sh index a508a0a672f..d2857449b33 100755 --- a/test/integration/targets/fetch/runme.sh +++ b/test/integration/targets/fetch/runme.sh @@ -27,7 +27,7 @@ ansible-playbook -i ../../inventory injection/avoid_slurp_return.yml -e "output_ # Change the known_hosts file to avoid changing the test environment export ANSIBLE_CACHE_PLUGIN=jsonfile export ANSIBLE_CACHE_PLUGIN_CONNECTION="${OUTPUT_DIR}/cache" -# Create a non-root user account and configure SSH acccess for that account +# Create a non-root user account and configure SSH access for that account ansible-playbook -i "${INVENTORY_PATH}" setup_unreadable_test.yml -e "output_dir=${OUTPUT_DIR}" "$@" # Run the tests as the unprivileged user without become to test the use of the stat module from the fetch module diff --git a/test/integration/targets/file/tasks/directory_as_dest.yml b/test/integration/targets/file/tasks/directory_as_dest.yml index 161a12a4bea..5b99d9f675a 100644 --- a/test/integration/targets/file/tasks/directory_as_dest.yml +++ b/test/integration/targets/file/tasks/directory_as_dest.yml @@ -24,7 +24,7 @@ content: 'Hello World' # -# Error condtion: specify a directory with state={link,file}, force=False +# Error condition: specify a directory with state={link,file}, force=False # # file raises an error diff --git a/test/integration/targets/get_url/tasks/use_netrc.yml b/test/integration/targets/get_url/tasks/use_netrc.yml index abef08e5218..c4b02075317 100644 --- a/test/integration/targets/get_url/tasks/use_netrc.yml +++ b/test/integration/targets/get_url/tasks/use_netrc.yml @@ -25,7 +25,7 @@ that: - (response['content'] | b64decode | from_json).user == 'foo' -- name: Test Bearer authorization is successfull with use_netrc=False +- name: Test Bearer authorization is successful with use_netrc=False get_url: url: https://{{ httpbin_host }}/bearer use_netrc: false @@ -40,7 +40,7 @@ src: "{{ remote_tmp_dir }}/msg.txt" register: response -- name: assert Test Bearer authorization is successfull with use_netrc=False +- name: assert Test Bearer authorization is successful with use_netrc=False assert: that: - (response['content'] | b64decode | from_json).token == 'foobar' diff --git a/test/integration/targets/git/tasks/submodules.yml b/test/integration/targets/git/tasks/submodules.yml index 0b311e7984d..44d50df1f37 100644 --- a/test/integration/targets/git/tasks/submodules.yml +++ b/test/integration/targets/git/tasks/submodules.yml @@ -30,7 +30,7 @@ command: 'ls -1a {{ checkout_dir }}/submodule1' register: submodule1 -- name: SUBMODULES | Ensure submodu1 is at the appropriate commit +- name: SUBMODULES | Ensure submodule1 is at the appropriate commit assert: that: '{{ submodule1.stdout_lines | length }} == 2' diff --git a/test/integration/targets/ignore_unreachable/runme.sh b/test/integration/targets/ignore_unreachable/runme.sh index 5b0ef190ef5..ff0ab736a05 100755 --- a/test/integration/targets/ignore_unreachable/runme.sh +++ b/test/integration/targets/ignore_unreachable/runme.sh @@ -2,7 +2,7 @@ set -eux export ANSIBLE_CONNECTION_PLUGINS=./fake_connectors -# use fake connectors that raise srrors at different stages +# use fake connectors that raise errors at different stages ansible-playbook test_with_bad_plugins.yml -i inventory -v "$@" unset ANSIBLE_CONNECTION_PLUGINS diff --git a/test/integration/targets/include_import/runme.sh b/test/integration/targets/include_import/runme.sh index 12ee15b1476..0f69eb512f6 100755 --- a/test/integration/targets/include_import/runme.sh +++ b/test/integration/targets/include_import/runme.sh @@ -68,7 +68,7 @@ ANSIBLE_STRATEGY='free' ansible-playbook test_copious_include_tasks.yml -i inve ANSIBLE_STRATEGY='free' ansible-playbook test_copious_include_tasks_fqcn.yml -i inventory "$@" rm -f tasks/hello/*.yml -# Inlcuded tasks should inherit attrs from non-dynamic blocks in parent chain +# Included tasks should inherit attrs from non-dynamic blocks in parent chain # https://github.com/ansible/ansible/pull/38827 ANSIBLE_STRATEGY='linear' ansible-playbook test_grandparent_inheritance.yml -i inventory "$@" ANSIBLE_STRATEGY='linear' ansible-playbook test_grandparent_inheritance_fqcn.yml -i inventory "$@" diff --git a/test/integration/targets/inventory/host_vars_constructed.yml b/test/integration/targets/inventory/host_vars_constructed.yml index eec52509938..19c3bf992cf 100644 --- a/test/integration/targets/inventory/host_vars_constructed.yml +++ b/test/integration/targets/inventory/host_vars_constructed.yml @@ -1,4 +1,4 @@ -plugin: ansible.legacy.contructed_with_hostvars +plugin: ansible.legacy.constructed_with_hostvars groups: host_var1_defined: host_var1 is defined keyed_groups: diff --git a/test/integration/targets/inventory/inventory_plugins/contructed_with_hostvars.py b/test/integration/targets/inventory/inventory_plugins/constructed_with_hostvars.py similarity index 100% rename from test/integration/targets/inventory/inventory_plugins/contructed_with_hostvars.py rename to test/integration/targets/inventory/inventory_plugins/constructed_with_hostvars.py diff --git a/test/integration/targets/lineinfile/tasks/main.yml b/test/integration/targets/lineinfile/tasks/main.yml index 1914920ab7a..752e96dff6b 100644 --- a/test/integration/targets/lineinfile/tasks/main.yml +++ b/test/integration/targets/lineinfile/tasks/main.yml @@ -875,7 +875,7 @@ path: "{{ remote_tmp_dir }}/testempty.txt" register: oneline_insbefore_file -- name: Assert that insertebefore worked properly with a one line file +- name: Assert that insertbefore worked properly with a one line file assert: that: - oneline_insbefore_test1 is changed diff --git a/test/integration/targets/lookup_ini/test_case_sensitive.yml b/test/integration/targets/lookup_ini/test_case_sensitive.yml index f66674cabe6..21b5264865d 100644 --- a/test/integration/targets/lookup_ini/test_case_sensitive.yml +++ b/test/integration/targets/lookup_ini/test_case_sensitive.yml @@ -22,7 +22,7 @@ msg: "{{ lookup('ini', 'NAME', file='lookup_case_check.properties', type='properties', case_sensitive=True) }}" register: duplicate_case_sensitive_properties_NAME - - name: Ensure the correct case-sensitive values were retieved + - name: Ensure the correct case-sensitive values were retrieved assert: that: - duplicate_case_sensitive_name.msg == 'bob' diff --git a/test/integration/targets/pause/runme.sh b/test/integration/targets/pause/runme.sh index eb2c6f7c7e8..f3c2d31a319 100755 --- a/test/integration/targets/pause/runme.sh +++ b/test/integration/targets/pause/runme.sh @@ -23,7 +23,7 @@ if sleep 0 | ansible localhost -m pause -a 'seconds=1' 2>&1 | grep '\[WARNING\]: echo "Incorrectly issued warning when run in the background" exit 1 else - echo "Succesfully ran in the background with no warning" + echo "Successfully ran in the background with no warning" fi # Test redirecting stdout diff --git a/test/integration/targets/pause/test-pause.yml b/test/integration/targets/pause/test-pause.yml index 1c8045b3e52..b2e9eeed5c9 100644 --- a/test/integration/targets/pause/test-pause.yml +++ b/test/integration/targets/pause/test-pause.yml @@ -4,7 +4,7 @@ become: no tasks: - - name: non-integer for duraction (EXPECTED FAILURE) + - name: non-integer for duration (EXPECTED FAILURE) pause: seconds: hello register: result diff --git a/test/integration/targets/pip/tasks/pip.yml b/test/integration/targets/pip/tasks/pip.yml index 9f1034d29a9..abe90db803c 100644 --- a/test/integration/targets/pip/tasks/pip.yml +++ b/test/integration/targets/pip/tasks/pip.yml @@ -219,13 +219,13 @@ state: absent name: "{{ remote_tmp_dir }}/pipenv" -- name: install pip throught pip into fresh virtualenv +- name: install pip through pip into fresh virtualenv pip: name: pip virtualenv: "{{ remote_tmp_dir }}/pipenv" register: pip_install_venv -- name: make sure pip in fresh virtualenv report changed +- name: make sure pip in fresh virtualenv reports changed assert: that: - "pip_install_venv is changed" @@ -371,7 +371,7 @@ version: "<100,!=1.0,>0.0.0" register: version2 -- name: assert no changes ocurred +- name: assert no changes occurred assert: that: "not version2.changed" diff --git a/test/integration/targets/plugin_loader/use_coll_name.yml b/test/integration/targets/plugin_loader/use_coll_name.yml index 66507ced2c1..3d6931c9747 100644 --- a/test/integration/targets/plugin_loader/use_coll_name.yml +++ b/test/integration/targets/plugin_loader/use_coll_name.yml @@ -1,4 +1,4 @@ -- name: ensure configuration is loaded when we use FQCN and have already loaded using 'short namne' (which is case will all builtin connection plugins) +- name: ensure configuration is loaded when we use FQCN and have already loaded using 'short name' (which is case will all builtin connection plugins) hosts: all gather_facts: false tasks: diff --git a/test/integration/targets/prepare_http_tests/tasks/kerberos.yml b/test/integration/targets/prepare_http_tests/tasks/kerberos.yml index 4b3d4887e77..80ab72815e4 100644 --- a/test/integration/targets/prepare_http_tests/tasks/kerberos.yml +++ b/test/integration/targets/prepare_http_tests/tasks/kerberos.yml @@ -41,7 +41,7 @@ paths: - '{{ role_path }}/vars' -- name: Install Kerberos sytem packages +- name: Install Kerberos system packages package: name: '{{ krb5_packages }}' state: present diff --git a/test/integration/targets/register/runme.sh b/test/integration/targets/register/runme.sh index 8adc5047551..8957096852b 100755 --- a/test/integration/targets/register/runme.sh +++ b/test/integration/targets/register/runme.sh @@ -5,7 +5,7 @@ set -eux # does it work? ansible-playbook can_register.yml -i ../../inventory -v "$@" -# ensure we do error when it its apprpos +# ensure we continue when ansible-playbook errors out set +e result="$(ansible-playbook invalid.yml -i ../../inventory -v "$@" 2>&1)" set -e diff --git a/test/integration/targets/rel_plugin_loading/subdir/inventory_plugins/notyaml.py b/test/integration/targets/rel_plugin_loading/subdir/inventory_plugins/notyaml.py index 4242e2e95f0..e93b500c286 100644 --- a/test/integration/targets/rel_plugin_loading/subdir/inventory_plugins/notyaml.py +++ b/test/integration/targets/rel_plugin_loading/subdir/inventory_plugins/notyaml.py @@ -105,7 +105,7 @@ class InventoryModule(BaseFileInventoryPlugin): raise AnsibleParserError('Plugin configuration YAML file, not YAML inventory') # We expect top level keys to correspond to groups, iterate over them - # to get host, vars and subgroups (which we iterate over recursivelly) + # to get host, vars and subgroups (which we iterate over recursively) if isinstance(data, MutableMapping): for group_name in data: self._parse_group(group_name, data[group_name]) diff --git a/test/integration/targets/roles/roles/data/tasks/main.yml b/test/integration/targets/roles/roles/data/tasks/main.yml index 8d85580c825..ab25f71a666 100644 --- a/test/integration/targets/roles/roles/data/tasks/main.yml +++ b/test/integration/targets/roles/roles/data/tasks/main.yml @@ -1,4 +1,4 @@ -- name: ensure data was correctly defind +- name: ensure data was correctly defined assert: that: - defined_var is defined diff --git a/test/integration/targets/rpm_key/tasks/rpm_key.yaml b/test/integration/targets/rpm_key/tasks/rpm_key.yaml index 204b42acfbd..fb0139b3ae4 100644 --- a/test/integration/targets/rpm_key/tasks/rpm_key.yaml +++ b/test/integration/targets/rpm_key/tasks/rpm_key.yaml @@ -51,7 +51,7 @@ key: /tmp/RPM-GPG-KEY-EPEL-7 register: idempotent_test -- name: check idempontence +- name: check idempotence assert: that: "not idempotent_test.changed" diff --git a/test/integration/targets/script/tasks/main.yml b/test/integration/targets/script/tasks/main.yml index b4deaedbe0d..59dc6eb2407 100644 --- a/test/integration/targets/script/tasks/main.yml +++ b/test/integration/targets/script/tasks/main.yml @@ -205,7 +205,7 @@ var: _check_mode_test2 verbosity: 2 -- name: Assert that task was skipped and mesage was returned +- name: Assert that task was skipped and message was returned assert: that: - _check_mode_test2 is skipped diff --git a/test/integration/targets/shell/connection_plugins/test_connection_default.py b/test/integration/targets/shell/connection_plugins/test_connection_default.py index 6f13102b075..5ff494c8126 100644 --- a/test/integration/targets/shell/connection_plugins/test_connection_default.py +++ b/test/integration/targets/shell/connection_plugins/test_connection_default.py @@ -17,7 +17,7 @@ from ansible.plugins.connection import ConnectionBase class Connection(ConnectionBase): - ''' test connnection ''' + ''' test connection ''' transport = 'test_connection_default' diff --git a/test/integration/targets/special_vars/tasks/main.yml b/test/integration/targets/special_vars/tasks/main.yml index 0e71f1dcdd8..4a9140c18c7 100644 --- a/test/integration/targets/special_vars/tasks/main.yml +++ b/test/integration/targets/special_vars/tasks/main.yml @@ -89,7 +89,7 @@ include_role: name: include_parent_role_vars -- name: check that ansible_parent_role_names is normally unset when not included/imported (after both import and inlcude) +- name: check that ansible_parent_role_names is normally unset when not included/imported (after both import and include) assert: that: - "ansible_parent_role_names is undefined" diff --git a/test/integration/targets/tasks/playbook.yml b/test/integration/targets/tasks/playbook.yml index 10bd8591bd7..83b64793f95 100644 --- a/test/integration/targets/tasks/playbook.yml +++ b/test/integration/targets/tasks/playbook.yml @@ -6,7 +6,7 @@ debug: msg: Hello - # ensure we properly test for an action name, not a task name when cheking for a meta task + # ensure we properly test for an action name, not a task name when checking for a meta task - name: "meta" debug: msg: Hello diff --git a/test/integration/targets/template/corner_cases.yml b/test/integration/targets/template/corner_cases.yml index 9d41ed94d90..ad711e5a927 100644 --- a/test/integration/targets/template/corner_cases.yml +++ b/test/integration/targets/template/corner_cases.yml @@ -6,7 +6,7 @@ dont: I SHOULD NOT BE TEMPLATED other: I WORK tasks: - - name: 'ensure we are not interpolating data from outside of j2 delmiters' + - name: 'ensure we are not interpolating data from outside of j2 delimiters' assert: that: - '"I SHOULD NOT BE TEMPLATED" not in adjacent' diff --git a/test/integration/targets/throttle/test_throttle.yml b/test/integration/targets/throttle/test_throttle.yml index 8990ea2f21a..94385a116fa 100644 --- a/test/integration/targets/throttle/test_throttle.yml +++ b/test/integration/targets/throttle/test_throttle.yml @@ -54,7 +54,7 @@ throttle: 12 throttle: 15 - block: - - name: "Teat 5 (max throttle: 3)" + - name: "Test 5 (max throttle: 3)" script: "test_throttle.py {{throttledir}} {{inventory_hostname}} 3" vars: test_id: 5 diff --git a/test/integration/targets/unarchive/tasks/test_missing_binaries.yml b/test/integration/targets/unarchive/tasks/test_missing_binaries.yml index 39bf4df5edc..8d9256e78ce 100644 --- a/test/integration/targets/unarchive/tasks/test_missing_binaries.yml +++ b/test/integration/targets/unarchive/tasks/test_missing_binaries.yml @@ -80,7 +80,7 @@ - zip - tar - - name: Reinsntall zip binaries + - name: Reinstall zip binaries package: name: - zip diff --git a/test/integration/targets/unarchive/tasks/test_parent_not_writeable.yml b/test/integration/targets/unarchive/tasks/test_parent_not_writeable.yml index bfb082c6aa7..9e0351e5659 100644 --- a/test/integration/targets/unarchive/tasks/test_parent_not_writeable.yml +++ b/test/integration/targets/unarchive/tasks/test_parent_not_writeable.yml @@ -4,7 +4,7 @@ ignore_errors: True register: unarchive04 -- name: fail if the proposed destination file exists for safey +- name: fail if the proposed destination file exists for safety fail: msg: /tmp/foo-unarchive.txt already exists, aborting when: unarchive04.stat.exists diff --git a/test/integration/targets/unarchive/tasks/test_symlink.yml b/test/integration/targets/unarchive/tasks/test_symlink.yml index a511ddde823..5b3b7ceec39 100644 --- a/test/integration/targets/unarchive/tasks/test_symlink.yml +++ b/test/integration/targets/unarchive/tasks/test_symlink.yml @@ -3,7 +3,7 @@ path: "{{ remote_tmp_dir }}/test-unarchive-tar-gz" state: directory -- name: Create a symlink to the detination dir +- name: Create a symlink to the destination dir file: path: "{{ remote_tmp_dir }}/link-to-unarchive-dir" src: "{{ remote_tmp_dir }}/test-unarchive-tar-gz" diff --git a/test/integration/targets/unicode/unicode.yml b/test/integration/targets/unicode/unicode.yml index 672133d580d..f586ba93eaf 100644 --- a/test/integration/targets/unicode/unicode.yml +++ b/test/integration/targets/unicode/unicode.yml @@ -82,7 +82,7 @@ that: - "'Zażółć gęślą jaźń' == results.ping" - - name: Command that echos a non-ascii env var + - name: Command that echoes a non-ascii env var command: "echo $option" environment: option: Zażółć diff --git a/test/integration/targets/unsafe_writes/runme.sh b/test/integration/targets/unsafe_writes/runme.sh index 619ce025680..90263cec4ea 100755 --- a/test/integration/targets/unsafe_writes/runme.sh +++ b/test/integration/targets/unsafe_writes/runme.sh @@ -8,5 +8,5 @@ ansible-playbook basic.yml -i ../../inventory "$@" # test enabled fallback env var ANSIBLE_UNSAFE_WRITES=1 ansible-playbook basic.yml -i ../../inventory "$@" -# test disnabled fallback env var +# test disabled fallback env var ANSIBLE_UNSAFE_WRITES=0 ansible-playbook basic.yml -i ../../inventory "$@" diff --git a/test/integration/targets/uri/tasks/main.yml b/test/integration/targets/uri/tasks/main.yml index 68f77cdc15d..b156f82cb99 100644 --- a/test/integration/targets/uri/tasks/main.yml +++ b/test/integration/targets/uri/tasks/main.yml @@ -232,7 +232,7 @@ register: result ignore_errors: true -- name: Ensure bad SSL site reidrect fails +- name: Ensure bad SSL site redirect fails assert: that: - result is failed diff --git a/test/integration/targets/uri/tasks/unix-socket.yml b/test/integration/targets/uri/tasks/unix-socket.yml index 6e6cf830eed..4a9d898ce3f 100644 --- a/test/integration/targets/uri/tasks/unix-socket.yml +++ b/test/integration/targets/uri/tasks/unix-socket.yml @@ -14,7 +14,7 @@ unix_socket: '{{ remote_tmp_dir }}/http.sock' register: unix_socket_http -- name: Test https connection to unix socket with valdiate_certs=false +- name: Test https connection to unix socket with validate_certs=false uri: url: https://localhost/get unix_socket: '{{ remote_tmp_dir }}/https.sock' diff --git a/test/integration/targets/win_raw/tasks/main.yml b/test/integration/targets/win_raw/tasks/main.yml index 31f90b85a6c..5c51c0a06f3 100644 --- a/test/integration/targets/win_raw/tasks/main.yml +++ b/test/integration/targets/win_raw/tasks/main.yml @@ -108,7 +108,7 @@ - name: unicode tests for psrp when: ansible_connection == 'psrp' block: - # Cannot test unicode passed into separate exec as PSRP doesn't run with a preset CP of 65001 which reuslts in ? for unicode chars + # Cannot test unicode passed into separate exec as PSRP doesn't run with a preset CP of 65001 which results in ? for unicode chars - name: run a raw command with unicode chars raw: Write-Output "! ЗАО. Руководство" register: raw_result2 diff --git a/test/lib/ansible_test/_internal/ci/azp.py b/test/lib/ansible_test/_internal/ci/azp.py index ebf260b9cfa..adc4f476741 100644 --- a/test/lib/ansible_test/_internal/ci/azp.py +++ b/test/lib/ansible_test/_internal/ci/azp.py @@ -221,7 +221,7 @@ class AzurePipelinesChanges: self.diff = [] def get_successful_merge_run_commits(self) -> set[str]: - """Return a set of recent successsful merge commits from Azure Pipelines.""" + """Return a set of recent successful merge commits from Azure Pipelines.""" parameters = dict( maxBuildsPerDefinition=100, # max 5000 queryOrder='queueTimeDescending', # assumes under normal circumstances that later queued jobs are for later commits diff --git a/test/lib/ansible_test/_internal/commands/integration/cloud/hcloud.py b/test/lib/ansible_test/_internal/commands/integration/cloud/hcloud.py index 04d6f7c62be..b9ee22747f3 100644 --- a/test/lib/ansible_test/_internal/commands/integration/cloud/hcloud.py +++ b/test/lib/ansible_test/_internal/commands/integration/cloud/hcloud.py @@ -78,7 +78,7 @@ class HcloudCloudProvider(CloudProvider): self._write_config(config) def _create_ansible_core_ci(self) -> AnsibleCoreCI: - """Return a Heztner instance of AnsibleCoreCI.""" + """Return a Hetzner instance of AnsibleCoreCI.""" return AnsibleCoreCI(self.args, CloudResource(platform='hetzner')) diff --git a/test/lib/ansible_test/_util/target/sanity/import/importer.py b/test/lib/ansible_test/_util/target/sanity/import/importer.py index 32eb424e226..d08f8e75dd0 100644 --- a/test/lib/ansible_test/_util/target/sanity/import/importer.py +++ b/test/lib/ansible_test/_util/target/sanity/import/importer.py @@ -159,7 +159,7 @@ def main(): loader = self._get_loader(fullname, path=path) if loader is not None: if has_py3_loader: - # loader is expected to be Optional[importlib.abc.Loader], but RestrictedModuleLoader does not inherit from importlib.abc.Loder + # loader is expected to be Optional[importlib.abc.Loader], but RestrictedModuleLoader does not inherit from importlib.abc.Loader return spec_from_loader(fullname, loader) # type: ignore[arg-type] raise ImportError("Failed to import '%s' due to a bug in ansible-test. Check importlib imports for typos." % fullname) return None diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_put.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_put.py index 38403c7e2a0..6b769e9060f 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_put.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/action/net_put.py @@ -78,7 +78,7 @@ class ActionModule(ActionBase): except ValueError as exc: return dict(failed=True, msg=to_text(exc)) - # Now src has resolved file write to disk in current diectory for scp + # Now src has resolved file write to disk in current directory for scp src = self._task.args.get("src") filename = str(uuid.uuid4()) cwd = self._loader.get_basedir() @@ -137,7 +137,7 @@ class ActionModule(ActionBase): result["msg"] = "Exception received: %s" % exc if mode == "text": - # Cleanup tmp file expanded wih ansible vars + # Cleanup tmp file expanded with ansible vars os.remove(output_file) result["changed"] = changed 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 8d077bd6964..649fb65ccdd 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 @@ -262,7 +262,7 @@ Function Get-AnsibleWindowsWebRequest { # proxy to work with, otherwise just ignore the credentials property. if ($null -ne $proxy) { if ($ProxyUseDefaultCredential) { - # Weird hack, $web_request.Proxy returns an IWebProxy object which only gurantees the Credentials + # Weird hack, $web_request.Proxy returns an IWebProxy object which only guarantees the Credentials # property. We cannot set UseDefaultCredentials so we just set the Credentials to the # DefaultCredentials in the CredentialCache which does the same thing. $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials diff --git a/test/support/windows-integration/plugins/modules/win_certificate_store.ps1 b/test/support/windows-integration/plugins/modules/win_certificate_store.ps1 index db984130e70..baa877d023c 100644 --- a/test/support/windows-integration/plugins/modules/win_certificate_store.ps1 +++ b/test/support/windows-integration/plugins/modules/win_certificate_store.ps1 @@ -46,7 +46,7 @@ Function Get-CertFile($module, $path, $password, $key_exportable, $key_storage) $store_flags = $store_flags -bor [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable } - # TODO: If I'm feeling adventurours, write code to parse PKCS#12 PEM encoded + # TODO: If I'm feeling adventurous, write code to parse PKCS#12 PEM encoded # file as .NET does not have an easy way to import this $certs = New-Object -TypeName System.Security.Cryptography.X509Certificates.X509Certificate2Collection @@ -140,7 +140,7 @@ Function Get-CertFileType($path, $password) { } elseif ($certs[0].HasPrivateKey) { return "pkcs12" } elseif ($path.EndsWith(".pfx") -or $path.EndsWith(".p12")) { - # no way to differenciate a pfx with a der file so we must rely on the + # no way to differentiate a pfx with a der file so we must rely on the # extension return "pkcs12" } else { diff --git a/test/support/windows-integration/plugins/modules/win_copy.ps1 b/test/support/windows-integration/plugins/modules/win_copy.ps1 index 6a26ee722d0..f9fc3fa26e1 100644 --- a/test/support/windows-integration/plugins/modules/win_copy.ps1 +++ b/test/support/windows-integration/plugins/modules/win_copy.ps1 @@ -220,7 +220,7 @@ Function Extract-ZipLegacy($src, $dest) { # - 4: do not display a progress dialog box $dest_path.CopyHere($entry, 1044) - # once file is extraced, we need to rename it with non base64 name + # once file is extracted, we need to rename it with non base64 name $combined_encoded_path = [System.IO.Path]::Combine($dest, $encoded_archive_entry) Move-Item -LiteralPath $combined_encoded_path -Destination $entry_target_path -Force | Out-Null } diff --git a/test/support/windows-integration/plugins/modules/win_copy.py b/test/support/windows-integration/plugins/modules/win_copy.py index a55f4c65b7e..bb8dbd61f20 100644 --- a/test/support/windows-integration/plugins/modules/win_copy.py +++ b/test/support/windows-integration/plugins/modules/win_copy.py @@ -61,7 +61,7 @@ options: is different than destination. - If set to C(no), the file will only be transferred if the destination does not exist. - - If set to C(no), no checksuming of the content is performed which can + - If set to C(no), no checksumming of the content is performed which can help improve performance on larger files. type: bool default: yes diff --git a/test/units/cli/test_galaxy.py b/test/units/cli/test_galaxy.py index 39362043342..ccd51eb688f 100644 --- a/test/units/cli/test_galaxy.py +++ b/test/units/cli/test_galaxy.py @@ -1090,7 +1090,7 @@ def test_parse_requirements_file_that_isnt_yaml(requirements_cli, requirements_f - galaxy.role - anotherrole ''')], indirect=True) -def test_parse_requirements_in_older_format_illega(requirements_cli, requirements_file): +def test_parse_requirements_in_older_format_illegal(requirements_cli, requirements_file): expected = "Expecting requirements file to be a dict with the key 'collections' that contains a list of " \ "collections to install" diff --git a/test/units/cli/test_vault.py b/test/units/cli/test_vault.py index a049610f2f6..c6f41c5b912 100644 --- a/test/units/cli/test_vault.py +++ b/test/units/cli/test_vault.py @@ -31,7 +31,7 @@ from ansible.module_utils.common.text.converters import to_text from ansible.utils import context_objects as co -# TODO: make these tests assert something, likely by verifing +# TODO: make these tests assert something, likely by verifying # mock calls diff --git a/test/units/executor/test_play_iterator.py b/test/units/executor/test_play_iterator.py index 14a9cc4ae57..a700903d291 100644 --- a/test/units/executor/test_play_iterator.py +++ b/test/units/executor/test_play_iterator.py @@ -352,7 +352,7 @@ class TestPlayIterator(unittest.TestCase): self.assertEqual(task.args, dict(msg='this is the first task')) # fail the host itr.mark_host_failed(hosts[0]) - # get the resuce task + # get the rescue task (host_state, task) = itr.get_next_task_for_host(hosts[0]) self.assertIsNotNone(task) self.assertEqual(task.action, 'debug') diff --git a/test/units/executor/test_task_result.py b/test/units/executor/test_task_result.py index 54b86133afd..efbee5174f6 100644 --- a/test/units/executor/test_task_result.py +++ b/test/units/executor/test_task_result.py @@ -150,7 +150,7 @@ class TestTaskResult(unittest.TestCase): mock_host = MagicMock() mock_task = MagicMock() - # no_log should not remove presrved keys + # no_log should not remove preserved keys tr = TaskResult( mock_host, mock_task, diff --git a/test/units/galaxy/test_api.py b/test/units/galaxy/test_api.py index c7ee165b8af..6acd165b1df 100644 --- a/test/units/galaxy/test_api.py +++ b/test/units/galaxy/test_api.py @@ -66,7 +66,7 @@ def get_test_galaxy_api(url, version, token_ins=None, token_value=None, no_cache token_value = token_value or "my token" token_ins = token_ins or GalaxyToken(token_value) api = GalaxyAPI(None, "test", url, no_cache=no_cache) - # Warning, this doesn't test g_connect() because _availabe_api_versions is set here. That means + # Warning, this doesn't test g_connect() because _available_api_versions is set here. That means # that urls for v2 servers have to append '/api/' themselves in the input data. api._available_api_versions = {version: '%s' % version} api.token = token_ins diff --git a/test/units/galaxy/test_collection_install.py b/test/units/galaxy/test_collection_install.py index 9398c00e3bd..1803611d9c3 100644 --- a/test/units/galaxy/test_collection_install.py +++ b/test/units/galaxy/test_collection_install.py @@ -461,7 +461,7 @@ def test_build_requirement_from_name_with_prerelease(galaxy_server, monkeypatch, assert mock_get_versions.mock_calls[0][1] == ('namespace', 'collection') -def test_build_requirment_from_name_with_prerelease_explicit(galaxy_server, monkeypatch, tmp_path_factory): +def test_build_requirement_from_name_with_prerelease_explicit(galaxy_server, monkeypatch, tmp_path_factory): mock_get_versions = MagicMock() mock_get_versions.return_value = ['1.0.1', '2.0.1-beta.1', '2.0.1'] monkeypatch.setattr(galaxy_server, 'get_collection_versions', mock_get_versions) diff --git a/test/units/module_utils/basic/test_sanitize_keys.py b/test/units/module_utils/basic/test_sanitize_keys.py index 3b66f83057b..1f5814d4ef5 100644 --- a/test/units/module_utils/basic/test_sanitize_keys.py +++ b/test/units/module_utils/basic/test_sanitize_keys.py @@ -49,7 +49,7 @@ def _run_comparison(obj): def test_sanitize_keys_dict(): - """ Test that santize_keys works with a dict. """ + """ Test that sanitize_keys works with a dict. """ d = [ None, diff --git a/test/units/module_utils/common/test_locale.py b/test/units/module_utils/common/test_locale.py index 80e28de0272..4570aab3990 100644 --- a/test/units/module_utils/common/test_locale.py +++ b/test/units/module_utils/common/test_locale.py @@ -10,7 +10,7 @@ from ansible.module_utils.common.locale import get_best_parsable_locale class TestLocale: - """Tests for get_best_paresable_locale""" + """Tests for get_best_parsable_locale""" mock_module = MagicMock() mock_module.get_bin_path = MagicMock(return_value='/usr/bin/locale') diff --git a/test/units/module_utils/common/warnings/test_warn.py b/test/units/module_utils/common/warnings/test_warn.py index ebb21c4ecfb..71186c2c677 100644 --- a/test/units/module_utils/common/warnings/test_warn.py +++ b/test/units/module_utils/common/warnings/test_warn.py @@ -25,7 +25,7 @@ def test_warn(): assert warnings._global_warnings == ['Warning message'] -def test_multiple_warningss(warning_messages): +def test_multiple_warnings(warning_messages): for w in warning_messages: warn(w) diff --git a/test/units/module_utils/facts/network/test_fc_wwn.py b/test/units/module_utils/facts/network/test_fc_wwn.py index fd0cc3e9288..4d877444e10 100644 --- a/test/units/module_utils/facts/network/test_fc_wwn.py +++ b/test/units/module_utils/facts/network/test_fc_wwn.py @@ -14,7 +14,7 @@ fcs0 Defined 00-00 8Gb PCI Express Dual Port FC Adapter (df1000f114108a03) fcs1 Available 04-00 8Gb PCI Express Dual Port FC Adapter (df1000f114108a03) """ -# a bit cutted output of lscfg (from Z0 to ZC) +# slightly cut output of lscfg (from Z0 to ZC) LSCFG_OUTPUT = """ fcs1 U78CB.001.WZS00ZS-P1-C9-T1 8Gb PCI Express Dual Port FC Adapter (df1000f114108a03) diff --git a/test/units/module_utils/facts/test_collector.py b/test/units/module_utils/facts/test_collector.py index 852273c3669..95b110333b1 100644 --- a/test/units/module_utils/facts/test_collector.py +++ b/test/units/module_utils/facts/test_collector.py @@ -259,7 +259,7 @@ class TestGetCollectorNames(unittest.TestCase): # and then minimal_gather_subset is added. so '!all', 'other' == '!all' self.assertEqual(res, set(['whatever'])) - def test_invaid_gather_subset(self): + def test_invalid_gather_subset(self): valid_subsets = frozenset(['my_fact', 'something_else']) minimal_gather_subset = frozenset(['my_fact']) diff --git a/test/units/module_utils/facts/test_facts.py b/test/units/module_utils/facts/test_facts.py index d0381a1ef4f..07eefc6c82c 100644 --- a/test/units/module_utils/facts/test_facts.py +++ b/test/units/module_utils/facts/test_facts.py @@ -515,7 +515,7 @@ MTAB_ENTRIES = [ ], ['fusectl', '/sys/fs/fuse/connections', 'fusectl', 'rw,relatime', '0', '0'], # Mount path with space in the name - # The space is encoded as \040 since the fields in /etc/mtab are space-delimeted + # The space is encoded as \040 since the fields in /etc/mtab are space-delimited ['/dev/sdz9', r'/mnt/foo\040bar', 'ext4', 'rw,relatime', '0', '0'], ['\\\\Windows\\share', '/data/', 'cifs', 'credentials=/root/.creds', '0', '0'], ] diff --git a/test/units/playbook/test_base.py b/test/units/playbook/test_base.py index 58253b26542..fba0a46bb38 100644 --- a/test/units/playbook/test_base.py +++ b/test/units/playbook/test_base.py @@ -489,7 +489,7 @@ class TestBaseSubClass(TestBase): def test_attr_remote_user(self): ds = {'remote_user': 'testuser'} bsc = self._base_validate(ds) - # TODO: attemp to verify we called parent gettters etc + # TODO: attempt to verify we called parent getters etc self.assertEqual(bsc.remote_user, 'testuser') def test_attr_example_undefined(self): diff --git a/test/units/playbook/test_included_file.py b/test/units/playbook/test_included_file.py index 7d1e7079fc1..29422b34966 100644 --- a/test/units/playbook/test_included_file.py +++ b/test/units/playbook/test_included_file.py @@ -220,7 +220,7 @@ def test_process_include_simulate_free_block_role_tasks(mock_iterator, have the same parent but are different tasks. Previously the comparison for equality did not check if the tasks were the same and only checked that the parents were the same. This lead to some tasks being run - incorrectly and some tasks being silient dropped.""" + incorrectly and some tasks being silently dropped.""" fake_loader = DictDataLoader({ 'include_test.yml': "", diff --git a/test/units/plugins/action/test_raw.py b/test/units/plugins/action/test_raw.py index 9413fdfb159..df68e9e0afa 100644 --- a/test/units/plugins/action/test_raw.py +++ b/test/units/plugins/action/test_raw.py @@ -46,8 +46,8 @@ class TestCopyResultExclude(unittest.TestCase): task.args = {'_raw_params': 'Args1'} return task - # The current behavior of the raw aciton in regards to executable is currently in question; - # the test_raw_executable_is_not_empty_string verifies the current behavior (whether it is desireed or not. + # The current behavior of the raw action in regards to executable is currently in question; + # the test_raw_executable_is_not_empty_string verifies the current behavior (whether it is desired or not). # Please refer to the following for context: # Issue: https://github.com/ansible/ansible/issues/16054 # PR: https://github.com/ansible/ansible/pull/16085 diff --git a/test/units/plugins/connection/test_ssh.py b/test/units/plugins/connection/test_ssh.py index 5207af7ed81..0bba41b6f14 100644 --- a/test/units/plugins/connection/test_ssh.py +++ b/test/units/plugins/connection/test_ssh.py @@ -497,7 +497,7 @@ class TestSSHConnectionRun(object): assert self.conn._send_initial_data.call_count == 1 assert self.conn._send_initial_data.call_args[0][1] == 'this is input data' - def test_pasword_without_data(self): + def test_password_without_data(self): # simulate no data input but Popen using new pty's fails self.mock_popen.return_value = None self.mock_popen.side_effect = [OSError(), self.mock_popen_res] diff --git a/test/units/template/test_template_utilities.py b/test/units/template/test_template_utilities.py index 5f934d93884..eaa47a2600e 100644 --- a/test/units/template/test_template_utilities.py +++ b/test/units/template/test_template_utilities.py @@ -23,7 +23,7 @@ import unittest from ansible.template import AnsibleUndefined, _escape_backslashes, _count_newlines_from_end # These are internal utility functions only needed for templating. They're -# algorithmic so good candidates for unittesting by themselves +# algorithmic so good candidates for unit testing by themselves class TestBackslashEscape(unittest.TestCase):