Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
kianmeng authored and philpep committed Mar 2, 2022
1 parent 3744c3e commit 683f33e
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Changelog
=====

* Add extras for backend dependencies (#454)
* Various enhencements of kitchen integration documentation
* Various enhancements of kitchen integration documentation
* ansible backend now support "password" field from ansible inventory
* New backend "openshift"

Expand All @@ -134,7 +134,7 @@ Changelog
=====

* New module "environment" for getting remote environment variables
* New module "block_device" exposing block device informations
* New module "block_device" exposing block device information
* Add a global flag --force-ansible to the command line
* Raise an error in case of missing ansible inventory file
* Fix an escape issue with ansible ssh args set inventory or configuration file
Expand Down Expand Up @@ -189,7 +189,7 @@ Changelog
3.0.1
=====

* Fix parsing of ipv6 adresses for paramiko, ssh and ansible backends.
* Fix parsing of ipv6 addresses for paramiko, ssh and ansible backends.
* Fix --connection=ansible invocation when no hosts are provided

3.0.0
Expand Down Expand Up @@ -237,7 +237,7 @@ Changelog
======

* Add support for ansible "become" user in ansible module
* Add failed/suceeded property on run() output
* Add failed/succeeded property on run() output

1.16.0
======
Expand Down Expand Up @@ -338,7 +338,7 @@ Changelog
1.7.0
=====

* Salt: allow specifiy config directory (#230)
* Salt: allow specify config directory (#230)
* Add a WinRM backend
* Socket: ipv6 sockets can handle ipv4 clients (#234)
* Service: Enhance upstart detection (#243)
Expand Down
4 changes: 2 additions & 2 deletions doc/source/backends.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Testinfra comes with several connections backends for remote command
execution.

When installing, you should select the backends you require as
``extras`` to ensure Python dependencies are satisifed (note various
``extras`` to ensure Python dependencies are satisfied (note various
system packaged tools may still be required). For example ::

$ pip install testinfra[ansible,salt]
Expand Down Expand Up @@ -85,7 +85,7 @@ The salt backend uses the `salt Python client API

Testinfra will use the salt connection channel to run commands.

Hosts can be seleted by using the `glob` and `compound matchers
Hosts can be selected by using the `glob` and `compound matchers
<https://docs.saltstack.com/en/latest/topics/targeting/compound.html>`_.


Expand Down
2 changes: 1 addition & 1 deletion doc/source/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Integration with KitchenCI

KitchenCI (aka Test Kitchen) can use testinfra via its :code:`shell` verifier.
Add the following to your :code:`.kitchen.yml`, this requires installing `paramiko`
additionaly (on your host machine, not in the VM handled by kitchen) ::
additionally (on your host machine, not in the VM handled by kitchen) ::

verifier:
name: shell
Expand Down
2 changes: 1 addition & 1 deletion test/test_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ def test_ansible_module(host):
assert passwd["owner"] == "root"
assert isinstance(passwd["size"], int)
assert passwd["path"] == "/etc/passwd"
# seems to vary with differents docker fs backend
# seems to vary with different docker fs backend
assert passwd["state"] in ("file", "hard")
assert passwd["uid"] == 0

Expand Down
2 changes: 1 addition & 1 deletion testinfra/backend/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def get_encoding(self) -> str:
if not encoding:
encoding = locale.getpreferredencoding()
if encoding == "ANSI_X3.4-1968":
# Workaround defaut encoding ascii without LANG set
# Workaround default encoding ascii without LANG set
encoding = "UTF-8"
return encoding

Expand Down
2 changes: 1 addition & 1 deletion testinfra/modules/iptables.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def _run_iptables(self, version, cmd, *args):
def rules(self, table="filter", chain=None, version=4):
"""Returns list of iptables rules
Based on ouput of `iptables -t TABLE -S CHAIN` command
Based on output of `iptables -t TABLE -S CHAIN` command
optionally takes takes the following arguments:
- table: defaults to `filter`
Expand Down
2 changes: 1 addition & 1 deletion testinfra/modules/systeminfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


class SystemInfo(InstanceModule):
"""Return system informations"""
"""Return system information"""

@cached_property
def sysinfo(self):
Expand Down
2 changes: 1 addition & 1 deletion testinfra/modules/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def shell(self):

@property
def password(self):
"""Return the crypted user password"""
"""Return the encrypted user password"""
return self.check_output("getent shadow %s", self.name).split(":")[1]

@property
Expand Down
2 changes: 1 addition & 1 deletion testinfra/utils/ansible_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def get_config(name, default=None):

spec = "{}://".format(connection)

# Fallback to user:pasword auth when identity file is not used
# Fallback to user:password auth when identity file is not used
if user and password and not kwargs.get("ssh_identity_file"):
spec += "{}:{}@".format(user, password)
elif user:
Expand Down

0 comments on commit 683f33e

Please sign in to comment.