1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00

s4:torture: Fix code spelling

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2023-10-09 12:09:01 +13:00 committed by Andrew Bartlett
parent fc1fd9c656
commit 378aa653a5
8 changed files with 15 additions and 15 deletions

View File

@ -1297,7 +1297,7 @@ class DrsReplicaSyncIntegrityTestCase(drs_base.DrsBaseTestCase):
self.nc_change() self.nc_change()
if mid_change: if mid_change:
# create even moire objects # create even more objects
objs = self.create_object_range(301, 450, prefix="obj2") objs = self.create_object_range(301, 450, prefix="obj2")
base_msg = self.default_conn.ldb_dc.search(base=self.base_dn, base_msg = self.default_conn.ldb_dc.search(base=self.base_dn,

View File

@ -109,7 +109,7 @@ class ReplAclTestCase(drs_base.DrsBaseTestCase):
self.assertIn(self.mod_becomes, self.assertIn(self.mod_becomes,
self.sd_utils_dc2.get_sd_as_sddl(self.ou)) 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.assertIn(self.mod_inherits_as,
self.sd_utils_dc1.get_sd_as_sddl(dn)) 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)) self.sd_utils_dc2.get_sd_as_sddl(sub3_ou_dn_final))
# Confirm inherited ACLs (from l3 to l4) are identical # Confirm inherited ACLs (from l3 to l4) are identical
# and where inherited # and were inherited
self.assertIn(self.mod_inherits_as, self.assertIn(self.mod_inherits_as,
self.sd_utils_dc1.get_sd_as_sddl(sub4_ou_dn_final)) 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), self.assertEqual(self.sd_utils_dc1.get_sd_as_sddl(sub4_ou_dn_final),

View File

@ -283,7 +283,7 @@ bool torture_bench_lookup(struct torture_context *torture)
/* Ok. We have run all our tests. Walk through the records we /* Ok. We have run all our tests. Walk through the records we
* accumulated and figure out whether the lookups took constant * accumulated and figure out whether the lookups took constant
* time of not. * time or not.
*/ */
result = true; result = true;
for (i = 0; i < ARRAY_SIZE(records); ++i) { for (i = 0; i < ARRAY_SIZE(records); ++i) {

View File

@ -3943,7 +3943,7 @@ static bool test_raw_oplock_doc(struct torture_context *tctx,
union smb_open io; union smb_open io;
uint16_t fnum=0; 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 */ /* cleanup */
smbcli_unlink(cli->tree, fname); 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); 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); smbcli_oplock_handler(cli->transport, oplock_handler_hold, cli->tree);

View File

@ -666,7 +666,7 @@ static bool test_validate_trust(struct torture_context *tctx,
break; break;
default: default:
torture_assert_int_equal(tctx, e->type, LSA_FOREST_TRUST_TOP_LEVEL_NAME, torture_assert_int_equal(tctx, e->type, LSA_FOREST_TRUST_TOP_LEVEL_NAME,
"Unexptected LSA_FOREST_TRUST_* type"); "Unexpected LSA_FOREST_TRUST_* type");
} }
} }

View File

@ -267,7 +267,7 @@ bool test_SetupCredentials2ex(struct dcerpc_pipe *p, struct torture_context *tct
"Credential chaining failed"); "Credential chaining failed");
} else { } else {
torture_assert(tctx, !netlogon_creds_client_check(creds, &credentials3), 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); 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, " "Unable to obtain a suitable session key, "
"after [%u] attempts\n", "after [%u] attempts\n",
i); i);
torture_fail(tctx, "Unable obtain suitable session key"); torture_fail(tctx, "Unable to obtain suitable session key");
} }
torture_assert_ntstatus_ok( torture_assert_ntstatus_ok(
@ -5551,7 +5551,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
"trust_list flags TREEROOT on forest root"); "trust_list flags TREEROOT on forest root");
torture_assert_int_equal(tctx, torture_assert_int_equal(tctx,
tex2->parent_index, 0, tex2->parent_index, 0,
"trust_list no parent on foreset root"); "trust_list no parent on forest root");
} }
torture_assert_int_equal(tctx, torture_assert_int_equal(tctx,
tex2->trust_type, LSA_TRUST_TYPE_UPLEVEL, tex2->trust_type, LSA_TRUST_TYPE_UPLEVEL,

View File

@ -781,7 +781,7 @@ static bool test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state,
sizeof(user_session_key)) != 0) { sizeof(user_session_key)) != 0) {
if (memcmp(lmv2_session_key.data, user_session_key, if (memcmp(lmv2_session_key.data, user_session_key,
sizeof(user_session_key)) == 0) { 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"); torture_comment(samlogon_state->tctx, "user_session_key:\n");
dump_data(1, user_session_key, 16); dump_data(1, user_session_key, 16);
torture_comment(samlogon_state->tctx, "expected:\n"); 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) { sizeof(lm_session_key)) != 0) {
if (memcmp(lmv2_session_key.data, lm_session_key, if (memcmp(lmv2_session_key.data, lm_session_key,
sizeof(lm_session_key)) == 0) { 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"); torture_comment(samlogon_state->tctx, "user_session_key:\n");
dump_data(1, lm_session_key, 8); dump_data(1, lm_session_key, 8);
torture_comment(samlogon_state->tctx, "expected:\n"); torture_comment(samlogon_state->tctx, "expected:\n");

View File

@ -2541,7 +2541,7 @@ static bool test_multichannel_bug_15346(struct torture_context *tctx,
"talloc_zero_array"); "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++) { 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++) { for (i = 0; i < state->num_conns; i++) {
struct test_multichannel_bug_15346_conn *conn = &state->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"); "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++) { for (i = 0; i < state->num_conns; i++) {
struct test_multichannel_bug_15346_conn *conn = &state->conns[i]; struct test_multichannel_bug_15346_conn *conn = &state->conns[i];