python:samba:tests: Fix code spelling

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

33 files changed, 58 insertions, 56 deletions

diff --git a/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py b/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py
index 42680df0d06..b1c1df8d41e 100644
--- a/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py
+++ b/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py
@@ -25,7 +25,7 @@ class DfsInheritanceSmbCaclsTests(InheritanceSmbCaclsTests):
     def setUp(self):
         # This is some intentional trickery to ensure we skip
         # InheritanceSmbCaclsTests.setUp so we can create a new
-        # test directory & file hierachy (including a nested dfs link)
+        # test directory & file hierarchy (including a nested dfs link)
         SmbCaclsBlockboxTestBase.setUp(self)
         smbclient_args = self.build_test_cmd("smbclient", ["//%s/%s" % (self.server, self.share), "-c", "mkdir %s" % os.getenv("TESTDIR", "smbcacls")])
         self.check_output(smbclient_args)
diff --git a/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py b/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py
index a7be768a9c9..cfe7e0b0b96 100644
--- a/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py
+++ b/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py
@@ -237,7 +237,7 @@ class InheritanceSmbCaclsTests(SmbCaclsBlockboxTestBase):
         try:
             # add flags on oi_dir
 
-            # This is somwhat artificial, we need to add a new acl to the directory
+            # This is somewhat artificial, we need to add a new acl to the directory
             # so that the following modify operation doesn't fail. Previously
             # '--modify' was used in place of '--add' but that resulted in failure
             # to access the directory ( or even modify the acl ).
@@ -462,7 +462,7 @@ class InheritanceSmbCaclsTests(SmbCaclsBlockboxTestBase):
         delete_ace_str = "ACL:%s:ALLOWED/0x0/RWD" % self.user
 
         try:
-            # This is somwhat artificial, we need to add a new acl to the
+            # This is somewhat artificial, we need to add a new acl to the
             # directory so that the following modify operation doesn't fail.
             # Previously '--modify' was used in place of '--add' but that
             # resulted in failure to access the directory ( or even modify
@@ -688,7 +688,7 @@ class InheritanceSmbCaclsTests(SmbCaclsBlockboxTestBase):
         try:
             # add flags on oi_dir
 
-            # This is somwhat artificial, we need to add a new acl to the
+            # This is somewhat artificial, we need to add a new acl to the
             # directory so that the following modify operation doesn't fail.
             # Previously '--modify' was used in place of '--add' but that
             # resulted in failure to access the directory ( or even modify
diff --git a/python/samba/tests/compression.py b/python/samba/tests/compression.py
index 48f8c874cba..45e6747b0dd 100644
--- a/python/samba/tests/compression.py
+++ b/python/samba/tests/compression.py
@@ -30,7 +30,7 @@ class BaseCompressionTest(TestCase):
         """Compress, decompress, assert equality with original.
 
         If size_delta is None, no size is given to decompress. This
-        should fail with the Huffman varient and succeed with plain.
+        should fail with the Huffman variant and succeed with plain.
         Otherwise size_delta is added to the gven size; if negative,
         we'd expect a failure, with plain compression a positive delta
         will succeed.
@@ -91,7 +91,7 @@ class LzxpressPlainCompressionTest(BaseCompressionTest):
 
     def test_round_trip_aaa_long(self):
         s = b'a' * 150000
-        # this *wont* fail because although the data will run out
+        # this *won't* fail because although the data will run out
         # before the buffer is full, LZXpress plain does not care
         # about that.
         try:
@@ -194,7 +194,7 @@ class LzxpressHuffmanCompressionTest(BaseCompressionTest):
 
         # For the Huffman algorithm, the length is really an essential
         # part of the compression data, and the bindings will reject a
-        # call with out it. This happens at the arument parsing stage,
+        # call with out it. This happens at the argument parsing stage,
         # so is a TypeError (i.e. wrong type of function), not a
         # CompressionError.
         self.assertRaises(TypeError,
diff --git a/python/samba/tests/core.py b/python/samba/tests/core.py
index e3b44d18696..9f53473d4f6 100644
--- a/python/samba/tests/core.py
+++ b/python/samba/tests/core.py
@@ -48,7 +48,7 @@ class SubstituteVarTestCase(TestCase):
     def test_check_all_substituted(self):
         samba.check_all_substituted("nothing to see here")
         self.assertRaises(Exception, samba.check_all_substituted,
-                          "Not subsituted: ${FOOBAR}")
+                          "Not substituted: ${FOOBAR}")
 
 
 class ArcfourTestCase(TestCase):
diff --git a/python/samba/tests/dcerpc/dnsserver.py b/python/samba/tests/dcerpc/dnsserver.py
index 1e583f4eb6c..6e7c6389bec 100644
--- a/python/samba/tests/dcerpc/dnsserver.py
+++ b/python/samba/tests/dcerpc/dnsserver.py
@@ -364,7 +364,7 @@ class DnsserverTests(RpcInterfaceTestCase):
         # there should be no A record, and one TOMBSTONE record.
         self.assert_num_records(self.custom_zone, "testrecord", 'A', 0)
         # we can't make assertions about the tombstone count based on
-        # RPC calls, as ther are no tombstones in RPCs (there is
+        # RPC calls, as there are no tombstones in RPCs (there is
         # "DNS_TYPE_ZERO" instead). Nor do tombstones show up if we
         # use DNS_TYPE_ALL.
         self.assert_num_records(self.custom_zone, "testrecord", 'ALL', 0)
diff --git a/python/samba/tests/dcerpc/srvsvc.py b/python/samba/tests/dcerpc/srvsvc.py
index 4590ca5a412..ddd9661f343 100644
--- a/python/samba/tests/dcerpc/srvsvc.py
+++ b/python/samba/tests/dcerpc/srvsvc.py
@@ -55,7 +55,7 @@ class SrvsvcTests(RpcInterfaceTestCase):
         parm_error = 0x00000000
         self.conn.NetShareAdd(self.server_unc, 502, share, parm_error)
         name = share.name
-        share.comment = "now sucessfully modified "
+        share.comment = "now successfully modified "
         parm_error = self.pipe.NetShareSetInfo(self.server_unc, name,
                                                502, share, parm_error)
 
diff --git a/python/samba/tests/dcerpc/string_tests.py b/python/samba/tests/dcerpc/string_tests.py
index f4fa99f3604..4dbbd3eed5c 100644
--- a/python/samba/tests/dcerpc/string_tests.py
+++ b/python/samba/tests/dcerpc/string_tests.py
@@ -116,7 +116,7 @@ class StringTests(samba.tests.TestCase):
 class StringTestsWithoutLeakCheck(samba.tests.TestCase):
     """We know that the ndr unpacking test leaves stuff in the
     autofree_context, and we don't want to worry about that. So for
-    this test we don't make meory leak assertions."""
+    this test we don't make memory leak assertions."""
 
     def test_string_from_ndr(self):
         info = drsblobs.repsFromTo2OtherInfo()
diff --git a/python/samba/tests/dns_aging.py b/python/samba/tests/dns_aging.py
index 4818451f789..31e4be9cb43 100644
--- a/python/samba/tests/dns_aging.py
+++ b/python/samba/tests/dns_aging.py
@@ -1920,7 +1920,7 @@ class TestDNSAging(DNSTest):
         self.assertEqual(rec.dwTimeStamp, 0)     # timestamp stays zero
 
         if failures:
-            self.fail(f"failed {failures}/{total} defered assertions")
+            self.fail(f"failed {failures}/{total} deferred assertions")
 
     def test_static_record_dynamic_update(self):
         """Add a static record, then a dynamic record.
diff --git a/python/samba/tests/domain_backup.py b/python/samba/tests/domain_backup.py
index 2feef28bcb4..433905e5a57 100644
--- a/python/samba/tests/domain_backup.py
+++ b/python/samba/tests/domain_backup.py
@@ -273,9 +273,9 @@ class DomainBackupBase(BlackboxTestCase):
 
         bkp_pd = get_prim_dom(paths.secrets, bkp_lp)
         self.assertEqual(len(bkp_pd), 1)
-        acn = bkp_pd[0].get('samAccountName')
-        self.assertIsNotNone(acn)
-        self.assertEqual(str(acn[0]), self.new_server + '$')
+        account = bkp_pd[0].get('samAccountName')
+        self.assertIsNotNone(account)
+        self.assertEqual(str(account[0]), self.new_server + '$')
         self.assertIsNotNone(bkp_pd[0].get('secret'))
 
         samdb = SamDB(url=paths.samdb, session_info=system_session(),
diff --git a/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py
index 59d946cd6a6..d8d9ac1ee3c 100644
--- a/python/samba/tests/dsdb.py
+++ b/python/samba/tests/dsdb.py
@@ -87,7 +87,7 @@ class DsdbAccountTests(TestCase):
 
     def test_ridalloc_next_free_rid(self):
         # Test RID allocation. We assume that RID
-        # pools allocated to us are continguous.
+        # pools allocated to us are contiguous.
         self.samdb.transaction_start()
         try:
             orig_rid_set = self.get_rid_set(self.rid_set_dn)
diff --git a/python/samba/tests/getdcname.py b/python/samba/tests/getdcname.py
index 6dbe7aba454..f5bf64b989c 100644
--- a/python/samba/tests/getdcname.py
+++ b/python/samba/tests/getdcname.py
@@ -443,7 +443,7 @@ class GetDCNameEx(samba.tests.TestCase):
                          self.realm.lower())
 
     def test_get_dc_winbind_need_2012r2(self):
-        """Test requring that we have a FL2012R2 DC as answer
+        """Test requiring that we have a FL2012R2 DC as answer
         """
         self.assertIsNotNone(self.trust_realm)
 
@@ -472,7 +472,7 @@ class GetDCNameEx(samba.tests.TestCase):
         self.assertTrue(cldap_netlogon_reply.server_type & nbt.NBT_SERVER_DS_9)
 
     def test_get_dc_direct_need_2012r2_but_not_found(self):
-        """Test requring that we have a FL2012R2 DC as answer, aginst the FL2008R2 domain
+        """Test requiring that we have a FL2012R2 DC as answer, against the FL2008R2 domain
 
         This test requires that the DC in the FL2008R2 does not claim
         to be 2012R2 capable (off by default in Samba)
@@ -492,7 +492,7 @@ class GetDCNameEx(samba.tests.TestCase):
                 self.fail(f"Incorrect error {estr} from GetDcNameEx looking for 2012R2 DC that was not available")
 
     def test_get_dc_direct_need_web_but_not_found(self):
-        """Test requring that we (do not) have a AD Web Services on the DC
+        """Test requiring that we (do not) have a AD Web Services on the DC
 
         This test requires that the DC does not advertise AD Web Services
 
@@ -525,7 +525,7 @@ class GetDCNameEx(samba.tests.TestCase):
         self.assertFalse(cldap_netlogon_reply.server_type & nbt.NBT_SERVER_ADS_WEB_SERVICE)
 
     def test_get_dc_winbind_need_web_but_not_found(self):
-        """Test requring that we (do not) have a AD Web Services on the trusted DC
+        """Test requiring that we (do not) have a AD Web Services on the trusted DC
 
         This test requires that the DC does not advertise AD Web Services
 
@@ -558,7 +558,7 @@ class GetDCNameEx(samba.tests.TestCase):
         self.assertFalse(cldap_netlogon_reply.server_type & nbt.NBT_SERVER_ADS_WEB_SERVICE)
 
     def test_get_dc_direct_need_2012r2(self):
-        """Test requring that we have a FL2012R2 DC as answer
+        """Test requiring that we have a FL2012R2 DC as answer
         """
         self.assertIsNotNone(self.trust_realm)
 
@@ -586,7 +586,7 @@ class GetDCNameEx(samba.tests.TestCase):
         self.assertTrue(cldap_netlogon_reply.server_type & nbt.NBT_SERVER_DS_9)
 
     def test_get_dc_winbind_need_2012r2_but_not_found(self):
-        """Test requring that we have a FL2012R2 DC as answer, aginst the FL2008R2 domain
+        """Test requiring that we have a FL2012R2 DC as answer, against the FL2008R2 domain
 
         This test requires that the DC in the FL2008R2 does not claim
         to be 2012R2 capable (off by default in Samba)
@@ -616,7 +616,7 @@ class GetDCNameEx(samba.tests.TestCase):
         self.assertFalse(cldap_netlogon_reply.server_type & nbt.NBT_SERVER_DS_9)
 
     def test_get_dc_winbind_need_2012r2_but_not_found_fallback(self):
-        """Test requring that we have a FL2012R2 DC as answer, aginst the
+        """Test requiring that we have a FL2012R2 DC as answer, against the
         FL2008R2 domain, then trying for just FL2008R2 (to show caching bugs)
 
         This test requires that the DC in the FL2008R2 does not claim
@@ -656,7 +656,7 @@ class GetDCNameEx(samba.tests.TestCase):
         self.assertTrue(cldap_netlogon_reply.server_type & nbt.NBT_SERVER_FULL_SECRET_DOMAIN_6)
 
     def test_get_dc_direct_need_2012r2_but_not_found_fallback(self):
-        """Test requring that we have a FL2012R2 DC as answer, aginst the
+        """Test requiring that we have a FL2012R2 DC as answer, against the
         FL2008R2 domain, then trying for just FL2008R2 (to show caching bugs)
 
         This test requires that the DC in the FL2008R2 does not claim
diff --git a/python/samba/tests/krb5/claims_in_pac.py b/python/samba/tests/krb5/claims_in_pac.py
index 386d28f2ec6..82cd7b7e694 100755
--- a/python/samba/tests/krb5/claims_in_pac.py
+++ b/python/samba/tests/krb5/claims_in_pac.py
@@ -307,7 +307,7 @@ class PacClaimsTests(TestCase):
         client_claims_bytes1 = ndr_pack(client_claims)
         client_claims2 = ndr_unpack(claims.CLAIMS_SET_METADATA_NDR, client_claims_bytes1)
 
-        # Confirm that despite no lenghts being set, the data is compressed correctly
+        # Confirm that despite no lengths being set, the data is compressed correctly
         self.assertEqual(client_claims2.claims.metadata.uncompressed_claims_set_size,
                          8232)
         self.assertEqual(client_claims2.claims.metadata.claims_set_size,
diff --git a/python/samba/tests/krb5/claims_tests.py b/python/samba/tests/krb5/claims_tests.py
index a531da7ecb0..3fefb4c11a7 100755
--- a/python/samba/tests/krb5/claims_tests.py
+++ b/python/samba/tests/krb5/claims_tests.py
@@ -334,7 +334,7 @@ class ClaimsTests(KDCBaseTest):
             expected_client_claims=(expected_claims
                                     if not remove_claims else None))
 
-    # Perform a test similar to that preceeding. This time, create both a user
+    # Perform a test similar to that preceding. This time, create both a user
     # and a computer account, each having an applicable claim. After obtaining
     # tickets, from which the claims are optionally removed, change the claim
     # attribute of each account to a different value. Then perform constrained
diff --git a/python/samba/tests/krb5/fast_tests.py b/python/samba/tests/krb5/fast_tests.py
index 1c4b5256cef..3feafc22f53 100755
--- a/python/samba/tests/krb5/fast_tests.py
+++ b/python/samba/tests/krb5/fast_tests.py
@@ -2010,7 +2010,7 @@ class FAST_Tests(KDCBaseTest):
 
         checksum_keys = self.get_krbtgt_checksum_key()
 
-        # Use our modifed TGT to replace the one in the request.
+        # Use our modified TGT to replace the one in the request.
         return self.modified_ticket(user_tgt,
                                     modify_fn=modify_fn,
                                     checksum_keys=checksum_keys)
diff --git a/python/samba/tests/krb5/kpasswd_tests.py b/python/samba/tests/krb5/kpasswd_tests.py
index 2ff72f24f5d..961feeac243 100755
--- a/python/samba/tests/krb5/kpasswd_tests.py
+++ b/python/samba/tests/krb5/kpasswd_tests.py
@@ -504,7 +504,7 @@ class KpasswdTests(KDCBaseTest):
                               target_realm=creds.get_realm())
 
     # Test setting a password, specifying both principal and realm of the
-    # target user, whem the user has control access on their account.
+    # target user, when the user has control access on their account.
     def test_kpasswd_set_target_princ_and_realm_access(self):
         # Create an account for testing.
         creds = self._get_creds()
diff --git a/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py b/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
index 6e173daf93e..3fda7d66cf0 100755
--- a/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
+++ b/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
@@ -42,7 +42,7 @@ global_hexdump = False
 class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest):
     ''' Tests for MS-KILE client principal look-up
         See [MS-KILE]: Kerberos Protocol Extensions
-            secion 3.3.5.6.1 Client Principal Lookup
+            section 3.3.5.6.1 Client Principal Lookup
     '''
 
     def setUp(self):
diff --git a/python/samba/tests/krb5_credentials.py b/python/samba/tests/krb5_credentials.py
index 6c30bef97af..0563e40286a 100644
--- a/python/samba/tests/krb5_credentials.py
+++ b/python/samba/tests/krb5_credentials.py
@@ -31,7 +31,7 @@ from samba.samdb import SamDB
 
 """KRB5 Integration tests for pycredentials.
 
-Seperated from py_credentials so as to allow running against just one
+Separated from py_credentials so as to allow running against just one
 environment so we know the server that we add the user on will be our
 KDC
 
diff --git a/python/samba/tests/ldap_referrals.py b/python/samba/tests/ldap_referrals.py
index b3f980e0301..eade5ef6682 100644
--- a/python/samba/tests/ldap_referrals.py
+++ b/python/samba/tests/ldap_referrals.py
@@ -64,11 +64,11 @@ class LdapReferralTest(samba.tests.TestCase):
             scope=ldb.SCOPE_SUBTREE,
             attrs=["objectGUID", "samAccountName"])
 
-        referals = res.referals
-        for referal in referals:
+        referrals = res.referals
+        for referral in referrals:
             self.assertTrue(
-                referal.startswith("ldap://"),
-                "{0} does not start with ldap://".format(referal))
+                referral.startswith("ldap://"),
+                "{0} does not start with ldap://".format(referral))
 
     # The referral entries for an ldaps request should have the ldaps scheme
     # i.e. then should all start with "ldaps://"
@@ -83,8 +83,8 @@ class LdapReferralTest(samba.tests.TestCase):
             scope=ldb.SCOPE_SUBTREE,
             attrs=["objectGUID", "samAccountName"])
 
-        referals = res.referals
-        for referal in referals:
+        referrals = res.referals
+        for referral in referrals:
             self.assertTrue(
-                referal.startswith("ldaps://"),
-                "{0} does not start with ldaps://".format(referal))
+                referral.startswith("ldaps://"),
+                "{0} does not start with ldaps://".format(referral))
diff --git a/python/samba/tests/ldap_upn_sam_account.py b/python/samba/tests/ldap_upn_sam_account.py
index cc1cce9b6c3..ab0ca063225 100644
--- a/python/samba/tests/ldap_upn_sam_account.py
+++ b/python/samba/tests/ldap_upn_sam_account.py
@@ -267,7 +267,7 @@ class LdapUpnSamTest(LdapUpnSamTestBase):
         #
         # * If a dictionary, it is a mapping of some of ['sam', 'upn']
         #   to strings (in this way, you can add two attributes in one
-        #   mesage, or attempt a samaccountname with '@').
+        #   message, or attempt a samaccountname with '@').
         #
         # expected can be «ok», «bad» (mapped to True and False,
         # respectively), or a specific LDB error code, if that exact
diff --git a/python/samba/tests/net_join_no_spnego.py b/python/samba/tests/net_join_no_spnego.py
index 6dbb9b0e983..70a9007324f 100644
--- a/python/samba/tests/net_join_no_spnego.py
+++ b/python/samba/tests/net_join_no_spnego.py
@@ -64,7 +64,7 @@ class NetJoinNoSpnegoTests(samba.tests.TestCaseInTempDir):
                 return
             else:
                 raise
-        self.fail("Shoud have rejected NTLMv2 without SPNEGO")
+        self.fail("Should have rejected NTLMv2 without SPNEGO")
 
     def test_net_join_no_spnego_ntlmv1(self):
         self.lp.set("client ipc max protocol", "NT1")
diff --git a/python/samba/tests/param.py b/python/samba/tests/param.py
index ae58074b80b..f201ef9e213 100644
--- a/python/samba/tests/param.py
+++ b/python/samba/tests/param.py
@@ -74,7 +74,7 @@ class LoadParmTestCase(samba.tests.TestCaseInTempDir):
 
     def test_dump(self):
         samba_lp = param.LoadParm()
-        # Just test successfull method execution (outputs to stdout)
+        # Just test successful method execution (outputs to stdout)
         self.assertEqual(None, samba_lp.dump())
 
     def test_dump_to_file(self):
@@ -87,7 +87,7 @@ class LoadParmTestCase(samba.tests.TestCaseInTempDir):
     def test_dump_a_parameter(self):
         samba_lp = param.LoadParm()
         samba_lp.load_default()
-        # Just test successfull method execution
+        # Just test successful method execution
         self.assertEqual(None, samba_lp.dump_a_parameter('interfaces'))
 
     def test_dump_a_parameter_to_file(self):
diff --git a/python/samba/tests/samba_tool/contact.py b/python/samba/tests/samba_tool/contact.py
index 7a8ff082e22..00050120bfc 100644
--- a/python/samba/tests/samba_tool/contact.py
+++ b/python/samba/tests/samba_tool/contact.py
@@ -295,7 +295,7 @@ class ContactCmdTestCase(SambaToolCmdTest):
             self.assertEqual("%s" % found.get("cn"), expected_cn)
 
             # remove given name, initials and surname
-            # (must forece new cn, because en empty new CN throws an error)
+            # (must force new cn, because en empty new CN throws an error)
             (result, out, err) = self.runsubcmd("contact", "rename", expected_cn,
                                                 "--force-new-cn=%s" % expected_cn,
                                                 "--surname=",
diff --git a/python/samba/tests/samba_tool/dnscmd.py b/python/samba/tests/samba_tool/dnscmd.py
index c36c4b535d0..0ce61de2a01 100644
--- a/python/samba/tests/samba_tool/dnscmd.py
+++ b/python/samba/tests/samba_tool/dnscmd.py
@@ -1136,7 +1136,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
                 (
                     # snizle has 2 A, 2 AAAA, 10 fancy, and 2 TXT records, in
                     # that order.
-                    # the A, AAAA, and TXT recrods should be dynamic
+                    # the A, AAAA, and TXT records should be dynamic
                     ['--mark-records-dynamic-regex=sniz'],
                     {'snizle': [('R', 'nowish'),
                                 ('R', 'nowish'),
@@ -1198,7 +1198,7 @@ class DnsCmdTestCase(SambaToolCmdTest):
                 (
                     # This regex should catch snizle, frobitz, and
                     # ts-multi. Note that the 1e7 ts-multi record is
-                    # alreay dynamic and doesn't change.
+                    # already dynamic and doesn't change.
                     ['--mark-records-dynamic-regex=[i]'],
                     {'ts-multi': [('R', 'nowish'),
                                   ('R', 'nowish'),
diff --git a/python/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py b/python/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
index ff7cdb774cb..efb9ed9536a 100644
--- a/python/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
+++ b/python/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
@@ -49,7 +49,7 @@ class DrsCloneDcDataLmdbSizeTestCase(SambaToolCmdTest):
     # Get the lmdb map size for the specified command
     #
     # While there is a python lmdb package available we use the lmdb command
-    # line utilities to avoid introducing a dependancy.
+    # line utilities to avoid introducing a dependency.
     #
     def get_lmdb_environment_size(self, path):
         (result, out, err) = self.run_command("mdb_stat -ne %s" % path)
diff --git a/python/samba/tests/samba_tool/passwordsettings.py b/python/samba/tests/samba_tool/passwordsettings.py
index f2d7a6e6a79..e9e995389bd 100644
--- a/python/samba/tests/samba_tool/passwordsettings.py
+++ b/python/samba/tests/samba_tool/passwordsettings.py
@@ -255,7 +255,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
                                                  "pso", "delete"), pso_name,
                                                  "-H", self.server,
                                                  self.user_auth)
-        self.assertCmdFail(result, "Deleteing a non-existent PSO should fail")
+        self.assertCmdFail(result, "Deleting a non-existent PSO should fail")
         self.assertIn("Unable to find PSO", err)
 
     def check_pso_applied(self, user, pso):
diff --git a/python/samba/tests/samba_tool/promote_dc_lmdb_size.py b/python/samba/tests/samba_tool/promote_dc_lmdb_size.py
index ba1086f291e..fbb0bfdeeff 100644
--- a/python/samba/tests/samba_tool/promote_dc_lmdb_size.py
+++ b/python/samba/tests/samba_tool/promote_dc_lmdb_size.py
@@ -75,7 +75,7 @@ class PromoteDcLmdbSizeTestCase(SambaToolCmdTest):
     # Get the lmdb map size for the specified command
     #
     # While there is a python lmdb package available we use the lmdb command
-    # line utilities to avoid introducing a dependancy.
+    # line utilities to avoid introducing a dependency.
     #
     def get_lmdb_environment_size(self, path):
         (result, out, err) = self.run_command("mdb_stat -ne %s" % path)
diff --git a/python/samba/tests/samba_tool/provision_lmdb_size.py b/python/samba/tests/samba_tool/provision_lmdb_size.py
index 6b0d2b74117..2435e120e07 100644
--- a/python/samba/tests/samba_tool/provision_lmdb_size.py
+++ b/python/samba/tests/samba_tool/provision_lmdb_size.py
@@ -50,7 +50,7 @@ class ProvisionLmdbSizeTestCase(SambaToolCmdTest):
     # Get the lmdb map size for the specified command
     #
     # While there is a python lmdb package available we use the lmdb command
-    # line utilities to avoid introducing a dependancy.
+    # line utilities to avoid introducing a dependency.
     #
     def get_lmdb_environment_size(self, path):
         (result, out, err) = self.run_command("mdb_stat -ne %s" % path)