s4:torture: Fix code spelling

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/torture/drs/python/getncchanges.py b/source4/torture/drs/python/getncchanges.py
index a994c6f97bc935baff1abc4cfef7548ffd049eb9..6b5456a66a8acd6defbdc30f3671c4172f83aba1 100644 (file)
--- a/source4/torture/drs/python/getncchanges.py
+++ b/source4/torture/drs/python/getncchanges.py
@@ -1297,7 +1297,7 @@ class DrsReplicaSyncIntegrityTestCase(drs_base.DrsBaseTestCase):
             self.nc_change()
 
         if mid_change:
-            # create even moire objects
+            # create even more objects
             objs = self.create_object_range(301, 450, prefix="obj2")
 
         base_msg = self.default_conn.ldb_dc.search(base=self.base_dn,

diff --git a/source4/torture/drs/python/repl_secdesc.py b/source4/torture/drs/python/repl_secdesc.py
index 6fb00196273b364a6f37614e962baa9fa944343f..38ae25a9099be6a50ae08784d7b021c1ecc2b416 100644 (file)
--- a/source4/torture/drs/python/repl_secdesc.py
+++ b/source4/torture/drs/python/repl_secdesc.py
@@ -109,7 +109,7 @@ class ReplAclTestCase(drs_base.DrsBaseTestCase):
         self.assertIn(self.mod_becomes,
                       self.sd_utils_dc2.get_sd_as_sddl(self.ou))
 
-        # Confirm inherited ACLs are identical and were inheritied
+        # Confirm inherited ACLs are identical and were inherited
 
         self.assertIn(self.mod_inherits_as,
                       self.sd_utils_dc1.get_sd_as_sddl(dn))
@@ -334,7 +334,7 @@ class ReplAclTestCase(drs_base.DrsBaseTestCase):
                           self.sd_utils_dc2.get_sd_as_sddl(sub3_ou_dn_final))
 
         # Confirm inherited ACLs (from l3 to l4) are identical
-        # and where inherited
+        # and were inherited
         self.assertIn(self.mod_inherits_as,
                       self.sd_utils_dc1.get_sd_as_sddl(sub4_ou_dn_final))
         self.assertEqual(self.sd_utils_dc1.get_sd_as_sddl(sub4_ou_dn_final),

diff --git a/source4/torture/raw/lookuprate.c b/source4/torture/raw/lookuprate.c
index 4b58df454e613ef94fe242bcad4795b1ece3c1f9..4243e35e6cf363085125c2ec4de0a97d4601c05e 100644 (file)
--- a/source4/torture/raw/lookuprate.c
+++ b/source4/torture/raw/lookuprate.c
@@ -283,7 +283,7 @@ bool torture_bench_lookup(struct torture_context *torture)
 
        /* Ok. We have run all our tests. Walk through the records we
         * accumulated and figure out whether the lookups took constant
-        * time of not.
+        * time or not.
         */
        result = true;
        for (i = 0; i < ARRAY_SIZE(records); ++i) {

diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index f3f78dd9cdef3ad701e7eec41c4326dc03fe82d1..173d5ca89b825dac8319a5b8bc209149ee7d254b 100644 (file)
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -3943,7 +3943,7 @@ static bool test_raw_oplock_doc(struct torture_context *tctx,
        union smb_open io;
        uint16_t fnum=0;
 
-       torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR);
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to set up test directory: " BASEDIR);
 
        /* cleanup */
        smbcli_unlink(cli->tree, fname);
@@ -4617,7 +4617,7 @@ bool torture_hold_oplock(struct torture_context *torture,
 
        printf("Setting up open files with oplocks in %s\n", BASEDIR);
 
-       torture_assert(torture, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR);
+       torture_assert(torture, torture_setup_dir(cli, BASEDIR), "Failed to set up test directory: " BASEDIR);
 
        smbcli_oplock_handler(cli->transport, oplock_handler_hold, cli->tree);
 

diff --git a/source4/torture/rpc/forest_trust.c b/source4/torture/rpc/forest_trust.c
index ceb1a7ecbd9d9d2b83166e2318d53b47b83cf8b0..e7b641e161a8f2aa472202a914b1231d9486c700 100644 (file)
--- a/source4/torture/rpc/forest_trust.c
+++ b/source4/torture/rpc/forest_trust.c
@@ -666,7 +666,7 @@ static bool test_validate_trust(struct torture_context *tctx,
                        break;
                default:
                        torture_assert_int_equal(tctx, e->type, LSA_FOREST_TRUST_TOP_LEVEL_NAME,
-                                                "Unexptected LSA_FOREST_TRUST_* type");
+                                                "Unexpected LSA_FOREST_TRUST_* type");
                }
        }
 

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 07e63612e81f274edbf75b63a67ea47677b8d8a1..c3715619cb7753145d40f47372abbba1d0ea527a 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -267,7 +267,7 @@ bool test_SetupCredentials2ex(struct dcerpc_pipe *p, struct torture_context *tct
                               "Credential chaining failed");
        } else {
                torture_assert(tctx, !netlogon_creds_client_check(creds, &credentials3),
-                              "Credential chaining passed unexptected");
+                              "Credential chaining passed unexpected");
        }
 
        torture_comment(tctx, "negotiate_flags=0x%08x\n", negotiate_flags);
@@ -892,7 +892,7 @@ static bool test_ServerAuthenticate2_encrypts_to_zero(
                        "Unable to obtain a suitable session key, "
                        "after [%u] attempts\n",
                        i);
-               torture_fail(tctx, "Unable obtain suitable session key");
+               torture_fail(tctx, "Unable to obtain suitable session key");
        }
 
        torture_assert_ntstatus_ok(
@@ -5551,7 +5551,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
                                         "trust_list flags TREEROOT on forest root");
                torture_assert_int_equal(tctx,
                                         tex2->parent_index, 0,
-                                        "trust_list no parent on foreset root");
+                                        "trust_list no parent on forest root");
        }
        torture_assert_int_equal(tctx,
                                 tex2->trust_type, LSA_TRUST_TYPE_UPLEVEL,

diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index fa07c65eefc3d80baa008a977f7893cc63cecee5..f16db64424117c7c8a57e5bd3bd792b9af8b516b 100644 (file)
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -781,7 +781,7 @@ static bool test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state,
                           sizeof(user_session_key)) != 0) {
                        if (memcmp(lmv2_session_key.data, user_session_key,
                                   sizeof(user_session_key)) == 0) {
-                               torture_comment(samlogon_state->tctx, "USER (NTLMv2) Session Key expected, got LMv2 sessesion key instead:\n");
+                               torture_comment(samlogon_state->tctx, "USER (NTLMv2) Session Key expected, got LMv2 session key instead:\n");
                                torture_comment(samlogon_state->tctx, "user_session_key:\n");
                                dump_data(1, user_session_key, 16);
                                torture_comment(samlogon_state->tctx, "expected:\n");
@@ -801,7 +801,7 @@ static bool test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state,
                           sizeof(lm_session_key)) != 0) {
                        if (memcmp(lmv2_session_key.data, lm_session_key,
                                   sizeof(lm_session_key)) == 0) {
-                               torture_comment(samlogon_state->tctx, "LM (NTLMv2) Session Key expected, got LMv2 sessesion key instead:\n");
+                               torture_comment(samlogon_state->tctx, "LM (NTLMv2) Session Key expected, got LMv2 session key instead:\n");
                                torture_comment(samlogon_state->tctx, "user_session_key:\n");
                                dump_data(1, lm_session_key, 8);
                                torture_comment(samlogon_state->tctx, "expected:\n");

diff --git a/source4/torture/smb2/multichannel.c b/source4/torture/smb2/multichannel.c
index a3616aea52d8c59e02f6951ac8bcaaef3b8f70c6..71d863804b770d9e465750dd227cd16ec2b0b69d 100644 (file)
--- a/source4/torture/smb2/multichannel.c
+++ b/source4/torture/smb2/multichannel.c
@@ -2541,7 +2541,7 @@ static bool test_multichannel_bug_15346(struct torture_context *tctx,
                            "talloc_zero_array");
 
        /*
-        * First we open additional the tcp connections
+        * First we open the additional tcp connections
         */
 
        for (i = 0; i < state->num_conns; i++) {
@@ -2613,7 +2613,7 @@ static bool test_multichannel_bug_15346(struct torture_context *tctx,
        }
 
        /*
-        * No we check that the connections are still usable
+        * Now we check that the connections are still usable
         */
        for (i = 0; i < state->num_conns; i++) {
                struct test_multichannel_bug_15346_conn *conn = &state->conns[i];
@@ -2630,7 +2630,7 @@ static bool test_multichannel_bug_15346(struct torture_context *tctx,
                                        "smb2_util_roothandle failed");
 
        /*
-        * No we check that the connections are still usable
+        * Now we check that the connections are still usable
         */
        for (i = 0; i < state->num_conns; i++) {
                struct test_multichannel_bug_15346_conn *conn = &state->conns[i];