diff options
41 files changed, 299 insertions, 292 deletions
diff --git a/lib/tdb/tools/tdbtorture.c b/lib/tdb/tools/tdbtorture.c index eda79f83d8e..79fe3cd5e0e 100644 --- a/lib/tdb/tools/tdbtorture.c +++ b/lib/tdb/tools/tdbtorture.c @@ -333,7 +333,7 @@ int main(int argc, char * const *argv) if ((pids[i]=fork()) == 0) { close(pfds[0]); if (i == 0) { - printf("testing with %d processes, %d loops, %d hash_size, seed=%d%s\n", + printf("Testing with %d processes, %d loops, %d hash_size, seed=%d%s\n", num_procs, num_loops, hash_size, seed, always_transaction ? " (all within transactions)" : ""); } exit(run_child(i, seed, num_loops, 0)); diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py index 7d6896ad3cb..d03a1d04419 100644 --- a/selftest/subunithelper.py +++ b/selftest/subunithelper.py @@ -32,19 +32,25 @@ def parse_results(msg_ops, statistics, fh): l = fh.readline() if l == "": break - if l.startswith("test: ") or l.startswith("testing: "): + parts = l.split(None, 1) + if not len(parts) == 2 or not l.startswith(parts[0]): + continue + command = parts[0].rstrip(":") + arg = parts[1] + if command in ("test", "testing"): + msg_ops.control_msg(l) + msg_ops.start_test(arg.rstrip()) + open_tests.append(arg.rstrip()) + elif command == "time": msg_ops.control_msg(l) - name = l.split(":", 1)[1].strip() - msg_ops.start_test(name) - open_tests.append(name) - elif l.startswith("time: "): grp = re.match( - "^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)\n", l) + "(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)\n", arg) msg_ops.report_time(time.mktime((int(grp.group(1)), int(grp.group(2)), int(grp.group(3)), int(grp.group(4)), int(grp.group(5)), int(grp.group(6)), 0, 0, 0))) - elif re.match("^(" + "|".join(VALID_RESULTS) + "): (.*?)( \[)?([ \t]*)( multipart)?\n", l): + elif command in VALID_RESULTS: msg_ops.control_msg(l) - grp = re.match("^(" + "|".join(VALID_RESULTS) + "): (.*?)( \[)?([ \t]*)( multipart)?\n", l) - (result, testname, hasreason) = (grp.group(1), grp.group(2), grp.group(3)) + result = command + grp = re.match("(.*?)( \[)?([ \t]*)( multipart)?\n", arg) + (testname, hasreason) = (grp.group(1), grp.group(2)) if hasreason: reason = "" # reason may be specified in next lines @@ -122,10 +128,10 @@ def parse_results(msg_ops, statistics, fh): msg_ops.end_testsuite(testname, "xfail", reason) elif result == "testsuite-error": msg_ops.end_testsuite(testname, "error", reason) - elif l.startswith("testsuite: "): - msg_ops.start_testsuite(l.split(":", 1)[1].strip()) - elif l.startswith("progress: "): - arg = l.split(":", 1)[1].strip() + elif command == "testsuite": + msg_ops.start_testsuite(arg.strip()) + elif command == "progress": + arg = arg.strip() if arg == "pop": msg_ops.progress(None, subunit.PROGRESS_POP) elif arg == "push": diff --git a/source4/dsdb/kcc/kcc_topology.c b/source4/dsdb/kcc/kcc_topology.c index 3530d0e1deb..0b251b781b1 100644 --- a/source4/dsdb/kcc/kcc_topology.c +++ b/source4/dsdb/kcc/kcc_topology.c @@ -3464,7 +3464,7 @@ NTSTATUS kcctpl_test(struct ldb_context *ldb) struct GUID_list keep; bool all_connected; - DEBUG(0, ("testing kcctpl_create_intersite_connections\n")); + DEBUG(0, ("Testing kcctpl_create_intersite_connections\n")); status = kcctpl_create_intersite_connections(ldb, tmp_ctx, &keep, &all_connected); DEBUG(4, ("%s\n", nt_errstr(status))); diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c index 1c877c761a1..077eb987acf 100644 --- a/source4/lib/ldb/tools/ldbtest.c +++ b/source4/lib/ldb/tools/ldbtest.c @@ -241,7 +241,7 @@ static void search_uid(struct ldb_context *ldb, struct ldb_dn *basedn, exit(1); } - printf("testing uid %d/%d - %d \r", i, uid, res->count); + printf("Testing uid %d/%d - %d \r", i, uid, res->count); fflush(stdout); talloc_free(res); diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index e4b4c62f619..d883a794986 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -930,7 +930,7 @@ error_test3: smbcli_unlink(cli1->tree, fname); - torture_comment(tctx, "testing ctemp\n"); + torture_comment(tctx, "Testing ctemp\n"); fnum1 = smbcli_ctemp(cli1->tree, "\\", &tmp_path); if (fnum1 == -1) { torture_comment(tctx, "ctemp failed (%s)\n", smbcli_errstr(cli1->tree)); diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c index 8a5c24ca794..174a1b2d6cb 100644 --- a/source4/torture/basic/denytest.c +++ b/source4/torture/basic/denytest.c @@ -1429,7 +1429,7 @@ bool torture_denytest1(struct torture_context *tctx, smbcli_close(cli1->tree, fnum1); } - torture_comment(tctx, "testing %d entries\n", (int)ARRAY_SIZE(denytable1)); + torture_comment(tctx, "Testing %d entries\n", (int)ARRAY_SIZE(denytable1)); GetTimeOfDay(&tv_start); @@ -1797,7 +1797,7 @@ static bool torture_ntdenytest(struct torture_context *tctx, io1.ntcreatex.in.fname = fname; io2 = io1; - torture_comment(tctx, "testing %d entries on %s\n", torture_numops, fname); + torture_comment(tctx, "Testing %d entries on %s\n", torture_numops, fname); for (i=0;i<torture_numops;i++) { NTSTATUS status1, status2, status2_p; diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index 2b08ad2d8a9..40a61400f7b 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -429,7 +429,7 @@ bool torture_ioctl_test(struct torture_context *tctx, torture_comment(tctx, "ioctl job info: %s\n", smbcli_errstr(cli->tree)); for (device=0;device<0x100;device++) { - torture_comment(tctx, "testing device=0x%x\n", device); + torture_comment(tctx, "Testing device=0x%x\n", device); for (function=0;function<0x100;function++) { parms.ioctl.in.request = (device << 16) | function; status = smb_raw_ioctl(cli->tree, mem_ctx, &parms); diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c index ca32d5ff964..45ef1c5c634 100644 --- a/source4/torture/basic/unlink.c +++ b/source4/torture/basic/unlink.c @@ -60,7 +60,7 @@ bool torture_unlinktest(struct torture_context *tctx, struct smbcli_state *cli) smbcli_close(cli->tree, fnum); smbcli_unlink(cli->tree, fname); - torture_comment(tctx, "testing unlink after ntcreatex with DELETE access\n"); + torture_comment(tctx, "Testing unlink after ntcreatex with DELETE access\n"); io.ntcreatex.level = RAW_OPEN_NTCREATEX; io.ntcreatex.in.root_fid.fnum = 0; diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c index 966c21d33e5..3c0bc5320c3 100644 --- a/source4/torture/libnet/libnet_share.c +++ b/source4/torture/libnet/libnet_share.c @@ -147,7 +147,7 @@ bool torture_listshares(struct torture_context *torture) for (i = 0; i < ARRAY_SIZE(levels); i++) { share.in.level = levels[i]; - torture_comment(torture, "testing libnet_ListShare level %u\n", share.in.level); + torture_comment(torture, "Testing libnet_ListShare level %u\n", share.in.level); status = libnet_ListShares(libnetctx, mem_ctx, &share); if (!NT_STATUS_IS_OK(status)) { diff --git a/source4/torture/libnetapi/libnetapi_group.c b/source4/torture/libnetapi/libnetapi_group.c index e8e5ad931ac..6f1428dbcfc 100644 --- a/source4/torture/libnetapi/libnetapi_group.c +++ b/source4/torture/libnetapi/libnetapi_group.c @@ -51,7 +51,7 @@ static NET_API_STATUS test_netgroupenum(struct torture_context *tctx, struct GROUP_INFO_2 *info2 = NULL; struct GROUP_INFO_3 *info3 = NULL; - torture_comment(tctx, "testing NetGroupEnum level %d\n", level); + torture_comment(tctx, "Testing NetGroupEnum level %d\n", level); do { status = NetGroupEnum(hostname, @@ -151,7 +151,7 @@ static NET_API_STATUS test_netgroupgetusers(struct torture_context *tctx, struct GROUP_USERS_INFO_0 *info0 = NULL; struct GROUP_USERS_INFO_1 *info1 = NULL; - torture_comment(tctx, "testing NetGroupGetUsers level %d\n", level); + torture_comment(tctx, "Testing NetGroupGetUsers level %d\n", level); do { status = NetGroupGetUsers(hostname, @@ -230,7 +230,7 @@ static NET_API_STATUS test_netgroupsetusers(struct torture_context *tctx, struct GROUP_USERS_INFO_0 *g0 = NULL; struct GROUP_USERS_INFO_1 *g1 = NULL; - torture_comment(tctx, "testing NetGroupSetUsers level %d\n", level); + torture_comment(tctx, "Testing NetGroupSetUsers level %d\n", level); switch (level) { case 0: @@ -313,7 +313,7 @@ bool torture_libnetapi_group(struct torture_context *tctx) g0.grpi0_name = groupname; - torture_comment(tctx, "testing NetGroupAdd\n"); + torture_comment(tctx, "Testing NetGroupAdd\n"); status = NetGroupAdd(hostname, 0, (uint8_t *)&g0, &parm_err); if (status) { @@ -345,7 +345,7 @@ bool torture_libnetapi_group(struct torture_context *tctx) for (i=0; i<ARRAY_SIZE(levels); i++) { - torture_comment(tctx, "testing NetGroupGetInfo level %d\n", levels[i]); + torture_comment(tctx, "Testing NetGroupGetInfo level %d\n", levels[i]); status = NetGroupGetInfo(hostname, groupname, levels[i], &buffer); if (status && status != 124) { @@ -358,7 +358,7 @@ bool torture_libnetapi_group(struct torture_context *tctx) g0.grpi0_name = groupname2; - torture_comment(tctx, "testing NetGroupSetInfo level 0\n"); + torture_comment(tctx, "Testing NetGroupSetInfo level 0\n"); status = NetGroupSetInfo(hostname, groupname, 0, (uint8_t *)&g0, &parm_err); switch (status) { @@ -412,7 +412,7 @@ bool torture_libnetapi_group(struct torture_context *tctx) } } - torture_comment(tctx, "testing NetGroupAddUser\n"); + torture_comment(tctx, "Testing NetGroupAddUser\n"); status = NetGroupAddUser(hostname, groupname2, username); if (status) { @@ -431,7 +431,7 @@ bool torture_libnetapi_group(struct torture_context *tctx) } } - torture_comment(tctx, "testing NetGroupDelUser\n"); + torture_comment(tctx, "Testing NetGroupDelUser\n"); status = NetGroupDelUser(hostname, groupname2, username); if (status) { @@ -487,7 +487,7 @@ bool torture_libnetapi_group(struct torture_context *tctx) /* delete */ - torture_comment(tctx, "testing NetGroupDel\n"); + torture_comment(tctx, "Testing NetGroupDel\n"); status = NetGroupDel(hostname, groupname2); if (status) { diff --git a/source4/torture/libnetapi/libnetapi_user.c b/source4/torture/libnetapi/libnetapi_user.c index 2731cbd7729..2afc1e59169 100644 --- a/source4/torture/libnetapi/libnetapi_user.c +++ b/source4/torture/libnetapi/libnetapi_user.c @@ -53,7 +53,7 @@ static NET_API_STATUS test_netuserenum(struct torture_context *tctx, struct USER_INFO_20 *info20 = NULL; struct USER_INFO_23 *info23 = NULL; - torture_comment(tctx, "testing NetUserEnum level %d\n", level); + torture_comment(tctx, "Testing NetUserEnum level %d\n", level); do { status = NetUserEnum(hostname, @@ -192,7 +192,7 @@ NET_API_STATUS test_netuseradd(struct torture_context *tctx, ZERO_STRUCT(u1); - torture_comment(tctx, "testing NetUserAdd\n"); + torture_comment(tctx, "Testing NetUserAdd\n"); u1.usri1_name = username; u1.usri1_password = "W297!832jD8J"; @@ -220,7 +220,7 @@ static NET_API_STATUS test_netusermodals(struct torture_context *tctx, for (i=0; i<ARRAY_SIZE(levels); i++) { - torture_comment(tctx, "testing NetUserModalsGet level %d\n", levels[i]); + torture_comment(tctx, "Testing NetUserModalsGet level %d\n", levels[i]); status = NetUserModalsGet(hostname, levels[i], &buffer); if (status) { @@ -235,7 +235,7 @@ static NET_API_STATUS test_netusermodals(struct torture_context *tctx, return status; } - torture_comment(tctx, "testing NetUserModalsSet\n"); + torture_comment(tctx, "Testing NetUserModalsSet\n"); status = NetUserModalsSet(hostname, 0, (uint8_t *)u0, &parm_err); if (status) { @@ -274,7 +274,7 @@ static NET_API_STATUS test_netusergetgroups(struct torture_context *tctx, struct GROUP_USERS_INFO_0 *i0; struct GROUP_USERS_INFO_1 *i1; - torture_comment(tctx, "testing NetUserGetGroups level %d\n", level); + torture_comment(tctx, "Testing NetUserGetGroups level %d\n", level); do { status = NetUserGetGroups(hostname, @@ -389,7 +389,7 @@ bool torture_libnetapi_user(struct torture_context *tctx) for (i=0; i<ARRAY_SIZE(levels); i++) { - torture_comment(tctx, "testing NetUserGetInfo level %d\n", levels[i]); + torture_comment(tctx, "Testing NetUserGetInfo level %d\n", levels[i]); status = NetUserGetInfo(hostname, TORTURE_TEST_USER, levels[i], &buffer); if (status && status != 124) { @@ -411,7 +411,7 @@ bool torture_libnetapi_user(struct torture_context *tctx) /* modify description */ - torture_comment(tctx, "testing NetUserSetInfo level %d\n", 1007); + torture_comment(tctx, "Testing NetUserSetInfo level %d\n", 1007); u1007.usri1007_comment = "NetApi modified user"; @@ -431,7 +431,7 @@ bool torture_libnetapi_user(struct torture_context *tctx) } } - torture_comment(tctx, "testing NetUserSetInfo level 0\n"); + torture_comment(tctx, "Testing NetUserSetInfo level 0\n"); u0.usri0_name = TORTURE_TEST_USER2; @@ -443,7 +443,7 @@ bool torture_libnetapi_user(struct torture_context *tctx) /* delete */ - torture_comment(tctx, "testing NetUserDel\n"); + torture_comment(tctx, "Testing NetUserDel\n"); status = NetUserDel(hostname, TORTURE_TEST_USER2); if (status) { diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index 17a46a482a0..b3ee8fc28f9 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -385,7 +385,7 @@ static int retest(struct smbcli_state *cli[NSERVERS][NCONNECTIONS], int n) { int i; - printf("testing %u ...\n", n); + printf("Testing %u ...\n", n); for (i=0; i<n; i++) { if (i && i % 100 == 0) { printf("%u\n", i); diff --git a/source4/torture/locktest2.c b/source4/torture/locktest2.c index 86f04cc7b0d..2cf28c3554c 100644 --- a/source4/torture/locktest2.c +++ b/source4/torture/locktest2.c @@ -340,7 +340,7 @@ static int retest(struct smbcli_state *cli[NSERVERS][NCONNECTIONS], int n) { int i; - printf("testing %u ...\n", n); + printf("Testing %u ...\n", n); for (i=0; i<n; i++) { if (i && i % 100 == 0) { printf("%u\n", i); diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c index 82eaba459db..1d4bee14865 100644 --- a/source4/torture/raw/acls.c +++ b/source4/torture/raw/acls.c @@ -373,7 +373,7 @@ static bool test_nttrans_create_ext(struct torture_context *tctx, static bool test_nttrans_create_file(struct torture_context *tctx, struct smbcli_state *cli) { - torture_comment(tctx, "testing nttrans create with sec_desc on files\n"); + torture_comment(tctx, "Testing nttrans create with sec_desc on files\n"); return test_nttrans_create_ext(tctx, cli, false); } @@ -381,7 +381,7 @@ static bool test_nttrans_create_file(struct torture_context *tctx, static bool test_nttrans_create_dir(struct torture_context *tctx, struct smbcli_state *cli) { - torture_comment(tctx, "testing nttrans create with sec_desc on directories\n"); + torture_comment(tctx, "Testing nttrans create with sec_desc on directories\n"); return test_nttrans_create_ext(tctx, cli, true); } @@ -963,7 +963,7 @@ static bool test_generic_bits(struct torture_context *tctx, expected_mask_anon |= SEC_STD_DELETE; } - torture_comment(tctx, "testing generic bits 0x%08x\n", + torture_comment(tctx, "Testing generic bits 0x%08x\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, owner_sid, NULL, @@ -1004,7 +1004,7 @@ static bool test_generic_bits(struct torture_context *tctx, continue; } - torture_comment(tctx, "testing generic bits 0x%08x (anonymous)\n", + torture_comment(tctx, "Testing generic bits 0x%08x (anonymous)\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, SID_NT_ANONYMOUS, NULL, @@ -1116,7 +1116,7 @@ static bool test_generic_bits(struct torture_context *tctx, expected_mask_anon |= SEC_STD_DELETE; } - torture_comment(tctx, "testing generic bits 0x%08x\n", + torture_comment(tctx, "Testing generic bits 0x%08x\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, owner_sid, NULL, @@ -1157,7 +1157,7 @@ static bool test_generic_bits(struct torture_context *tctx, continue; } - torture_comment(tctx, "testing generic bits 0x%08x (anonymous)\n", + torture_comment(tctx, "Testing generic bits 0x%08x (anonymous)\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, SID_NT_ANONYMOUS, NULL, @@ -1708,7 +1708,7 @@ static bool test_inheritance(struct torture_context *tctx, } } - torture_comment(tctx, "testing access checks on inherited create with %s\n", fname1); + torture_comment(tctx, "Testing access checks on inherited create with %s\n", fname1); sd = security_descriptor_dacl_create(tctx, 0, NULL, NULL, owner_sid, diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c index 433525b7ccb..aaf4446b8ea 100644 --- a/source4/torture/raw/chkpath.c +++ b/source4/torture/raw/chkpath.c @@ -176,14 +176,14 @@ static bool test_chkpath(struct smbcli_state *cli, struct torture_context *tctx) /* Note that the two following paths are identical but give different NT status returns for chkpth and findfirst. */ - printf("testing findfirst on %s\n", "\\.\\\\\\\\\\\\."); + printf("Testing findfirst on %s\n", "\\.\\\\\\\\\\\\."); status = single_search(cli, tctx, "\\.\\\\\\\\\\\\."); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_INVALID,NT_STATUS_DOS(ERRDOS,ERRinvalidname)); ret &= test_path(cli, "\\.\\\\\\\\\\\\.", NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath)); /* We expect this open to fail with the same error code as the chkpath below. */ - printf("testing Open on %s\n", "\\.\\\\\\\\\\\\."); + printf("Testing Open on %s\n", "\\.\\\\\\\\\\\\."); /* findfirst seems to fail with a different error. */ fnum1 = smbcli_nt_create_full(cli->tree, "\\.\\\\\\\\\\\\.", 0, SEC_RIGHTS_FILE_ALL, @@ -224,7 +224,7 @@ static bool test_chkpath(struct smbcli_state *cli, struct torture_context *tctx) ret &= test_path(cli, BASEDIR "\\nt\\V S\\VB98\\vb6.exe", NT_STATUS_NOT_A_DIRECTORY,NT_STATUS_DOS(ERRDOS,ERRbadpath)); /* We expect this open to fail with the same error code as the chkpath below. */ - printf("testing Open on %s\n", BASEDIR".\\.\\.\\.\\foo\\..\\.\\"); + printf("Testing Open on %s\n", BASEDIR".\\.\\.\\.\\foo\\..\\.\\"); /* findfirst seems to fail with a different error. */ fnum1 = smbcli_nt_create_full(cli->tree, BASEDIR".\\.\\.\\.\\foo\\..\\.\\", 0, SEC_RIGHTS_FILE_ALL, @@ -237,13 +237,13 @@ static bool test_chkpath(struct smbcli_state *cli, struct torture_context *tctx) status = smbcli_nt_error(cli->tree); CHECK_STATUS(status, NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath)); - printf("testing findfirst on %s\n", BASEDIR".\\.\\.\\.\\foo\\..\\.\\"); + printf("Testing findfirst on %s\n", BASEDIR".\\.\\.\\.\\foo\\..\\.\\"); status = single_search(cli, tctx, BASEDIR".\\.\\.\\.\\foo\\..\\.\\"); CHECK_STATUS(status, NT_STATUS_OBJECT_PATH_NOT_FOUND,NT_STATUS_DOS(ERRDOS,ERRbadpath)); /* We expect this open to fail with the same error code as the chkpath below. */ /* findfirst seems to fail with a different error. */ - printf("testing Open on %s\n", BASEDIR "\\nt\\V S\\VB98\\vb6.exe\\3"); + printf("Testing Open on %s\n", BASEDIR "\\nt\\V S\\VB98\\vb6.exe\\3"); fnum1 = smbcli_nt_create_full(cli->tree, BASEDIR "\\nt\\V S\\VB98\\vb6.exe\\3", 0, SEC_RIGHTS_FILE_ALL, FILE_ATTRIBUTE_NORMAL, diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c index 01175836df0..e1b2b7db61e 100644 --- a/source4/torture/raw/close.c +++ b/source4/torture/raw/close.c @@ -67,7 +67,7 @@ bool torture_raw_close(struct torture_context *torture, status = smb_raw_close(cli->tree, &io); CHECK_STATUS(status, NT_STATUS_INVALID_HANDLE); - printf("testing close.in.write_time\n"); + printf("Testing close.in.write_time\n"); /* the file should have the write time set */ finfo.generic.level = RAW_FILEINFO_ALL_INFO; @@ -83,7 +83,7 @@ bool torture_raw_close(struct torture_context *torture, ret = false; } - printf("testing other times\n"); + printf("Testing other times\n"); /* none of the other times should be set to that time */ if (nt_time_equal(&finfo.all_info.out.write_time, @@ -133,7 +133,7 @@ bool torture_raw_close(struct torture_context *torture, ret = false; } - printf("testing splclose\n"); + printf("Testing splclose\n"); /* check splclose on a file */ REOPEN; @@ -142,7 +142,7 @@ bool torture_raw_close(struct torture_context *torture, status = smb_raw_close(cli->tree, &io); CHECK_STATUS(status, NT_STATUS_DOS(ERRSRV, ERRerror)); - printf("testing flush\n"); + printf("Testing flush\n"); smbcli_close(cli->tree, fnum); io_flush.flush.level = RAW_FLUSH_FLUSH; diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c index 49564dc1ad5..73a25fd3456 100644 --- a/source4/torture/raw/composite.c +++ b/source4/torture/raw/composite.c @@ -65,7 +65,7 @@ static bool test_loadfile(struct smbcli_state *cli, struct torture_context *tctx io1.in.data = data; io1.in.size = len; - printf("testing savefile\n"); + printf("Testing savefile\n"); status = smb_composite_savefile(cli->tree, &io1); if (!NT_STATUS_IS_OK(status)) { @@ -75,7 +75,7 @@ static bool test_loadfile(struct smbcli_state *cli, struct torture_context *tctx io2.in.fname = fname; - printf("testing parallel loadfile with %d ops\n", num_ops); + printf("Testing parallel loadfile with %d ops\n", num_ops); c = talloc_array(tctx, struct composite_context *, num_ops); @@ -145,7 +145,7 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct io1.in.data = data; io1.in.size = len; - printf("testing savefile\n"); + printf("Testing savefile\n"); status = smb_composite_savefile(cli->tree, &io1); if (!NT_STATUS_IS_OK(status)) { @@ -168,7 +168,7 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct lp_smbcli_options(tctx->lp_ctx, &io2.in.options); lp_smbcli_session_options(tctx->lp_ctx, &io2.in.session_options); - printf("testing parallel fetchfile with %d ops\n", torture_numops); + printf("Testing parallel fetchfile with %d ops\n", torture_numops); event_ctx = cli->transport->socket->event.ctx; c = talloc_array(tctx, struct composite_context *, torture_numops); @@ -284,7 +284,7 @@ static bool test_appendacl(struct smbcli_state *cli, struct torture_context *tct /* set parameters for appendacl async call */ - printf("testing parallel appendacl with %d ops\n", num_ops); + printf("Testing parallel appendacl with %d ops\n", num_ops); c = talloc_array(tctx, struct composite_context *, num_ops); io = talloc_array(tctx, struct smb_composite_appendacl *, num_ops); @@ -358,7 +358,8 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx) io1.in.iconv_convenience = lp_iconv_convenience(tctx->lp_ctx); io1.in.gensec_settings = lp_gensec_settings(tctx, tctx->lp_ctx); - printf("testing parallel queryfsinfo [Object ID] with %d ops\n", torture_numops); + printf("Testing parallel queryfsinfo [Object ID] with %d ops\n", + torture_numops); event_ctx = tctx->ev; c = talloc_array(tctx, struct composite_context *, torture_numops); diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index 6c86a6f6158..02076dfbb84 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -541,7 +541,7 @@ static bool test_async(struct torture_context *tctx, t = time(NULL); - torture_comment(tctx, "testing cancel by CANCEL_LOCK\n"); + torture_comment(tctx, "Testing cancel by CANCEL_LOCK\n"); /* setup a timed lock */ io.lockx.in.timeout = 10000; @@ -584,7 +584,7 @@ static bool test_async(struct torture_context *tctx, * accept the request but only cancel the first lock. Samba3 * now does what Windows does (JRA). */ - torture_comment(tctx, "testing multiple cancel\n"); + torture_comment(tctx, "Testing multiple cancel\n"); /* acquire second lock */ io.lockx.in.timeout = 0; @@ -654,7 +654,7 @@ static bool test_async(struct torture_context *tctx, /* If a lock request contained multiple ranges and we are cancelling * one while it's still pending, what happens? */ - torture_comment(tctx, "testing cancel 1/2 lock request\n"); + torture_comment(tctx, "Testing cancel 1/2 lock request\n"); /* Send request with two ranges */ io.lockx.in.timeout = -1; @@ -695,7 +695,7 @@ static bool test_async(struct torture_context *tctx, status = smb_raw_lock(cli->tree, &io); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing cancel 2/2 lock request\n"); + torture_comment(tctx, "Testing cancel 2/2 lock request\n"); /* Lock second range so it contends */ io.lockx.in.timeout = 0; @@ -745,7 +745,7 @@ static bool test_async(struct torture_context *tctx, status = smb_raw_lock(cli->tree, &io); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing cancel by unlock\n"); + torture_comment(tctx, "Testing cancel by unlock\n"); io.lockx.in.ulock_cnt = 0; io.lockx.in.lock_cnt = 1; io.lockx.in.mode = LOCKING_ANDX_LARGE_FILES; @@ -772,7 +772,7 @@ static bool test_async(struct torture_context *tctx, "lock cancel by unlock was not immediate (%s) - took %d secs\n", __location__, (int)(time(NULL)-t))); - torture_comment(tctx, "testing cancel by close\n"); + torture_comment(tctx, "Testing cancel by close\n"); io.lockx.in.ulock_cnt = 0; io.lockx.in.lock_cnt = 1; io.lockx.in.mode = LOCKING_ANDX_LARGE_FILES; @@ -822,7 +822,7 @@ static bool test_async(struct torture_context *tctx, CHECK_STATUS(status, NT_STATUS_OK); tree->tid = tcon.tconx.out.tid; - torture_comment(tctx, "testing cancel by exit\n"); + torture_comment(tctx, "Testing cancel by exit\n"); if (TARGET_SUPPORTS_SMBEXIT(tctx)) { fname = BASEDIR "\\test_exit.txt"; fnum = smbcli_open(tree, fname, O_RDWR|O_CREAT, DENY_NONE); @@ -875,7 +875,7 @@ static bool test_async(struct torture_context *tctx, " skipping test, SMBExit not supported\n"); } - torture_comment(tctx, "testing cancel by ulogoff\n"); + torture_comment(tctx, "Testing cancel by ulogoff\n"); fname = BASEDIR "\\test_ulogoff.txt"; fnum = smbcli_open(tree, fname, O_RDWR|O_CREAT, DENY_NONE); torture_assert(tctx,(fnum != -1), talloc_asprintf(tctx, @@ -930,7 +930,7 @@ static bool test_async(struct torture_context *tctx, torture_assert(tctx,!(time(NULL) > t+2), talloc_asprintf(tctx, "lock cancel by ulogoff was not immediate (%s)\n", __location__)); - torture_comment(tctx, "testing cancel by tdis\n"); + torture_comment(tctx, "Testing cancel by tdis\n"); tree->session = cli->session; fname = BASEDIR "\\test_tdis.txt"; @@ -1004,7 +1004,7 @@ static bool test_errorcode(struct torture_context *tctx, torture_comment(tctx, "Testing LOCK_NOT_GRANTED vs. FILE_LOCK_CONFLICT\n"); - torture_comment(tctx, "testing with timeout = 0\n"); + torture_comment(tctx, "Testing with timeout = 0\n"); fname = BASEDIR "\\test0.txt"; t = 0; @@ -1307,14 +1307,14 @@ next_run: if (t == 0) { smb_raw_exit(cli->session); t = 1; - torture_comment(tctx, "testing with timeout > 0 (=%d)\n", + torture_comment(tctx, "Testing with timeout > 0 (=%d)\n", t); fname = BASEDIR "\\test1.txt"; goto next_run; } t = 4000; - torture_comment(tctx, "testing special cases with timeout > 0 (=%d)\n", + torture_comment(tctx, "Testing special cases with timeout > 0 (=%d)\n", t); /* @@ -1323,7 +1323,7 @@ next_run: * to the client (after the timeout went by) */ smb_raw_exit(cli->session); - torture_comment(tctx, "testing a conflict while a lock is pending\n"); + torture_comment(tctx, "Testing a conflict while a lock is pending\n"); fname = BASEDIR "\\test2.txt"; fnum = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE); torture_assert(tctx,(fnum != -1), talloc_asprintf(tctx, diff --git a/source4/torture/raw/lookuprate.c b/source4/torture/raw/lookuprate.c index 13605f5b71e..96ae92f1e87 100644 --- a/source4/torture/raw/lookuprate.c +++ b/source4/torture/raw/lookuprate.c @@ -244,7 +244,7 @@ bool torture_bench_lookup(struct torture_context *torture) remove_working_directory(cli->tree, BASEDIR); for (i = 0; i < ARRAY_SIZE(records); ++i) { - printf("testing lookup rate with %u directory entries\n", + printf("Testing lookup rate with %u directory entries\n", records[i].dirent_count); status = fill_directory(cli->tree, BASEDIR, diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c index c109ee7cf72..9c744b2db8e 100644 --- a/source4/torture/raw/mkdir.c +++ b/source4/torture/raw/mkdir.c @@ -56,7 +56,7 @@ static bool test_mkdir(struct smbcli_state *cli, struct torture_context *tctx) status = smb_raw_mkdir(cli->tree, &md); CHECK_STATUS(status, NT_STATUS_OK); - printf("testing mkdir collision\n"); + printf("Testing mkdir collision\n"); /* 2nd create */ status = smb_raw_mkdir(cli->tree, &md); @@ -70,14 +70,14 @@ static bool test_mkdir(struct smbcli_state *cli, struct torture_context *tctx) status = smb_raw_rmdir(cli->tree, &rd); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); - printf("testing mkdir collision with file\n"); + printf("Testing mkdir collision with file\n"); /* name collision with a file */ smbcli_close(cli->tree, create_complex_file(cli, tctx, path)); status = smb_raw_mkdir(cli->tree, &md); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_COLLISION); - printf("testing rmdir with file\n"); + printf("Testing rmdir with file\n"); /* delete a file with rmdir */ status = smb_raw_rmdir(cli->tree, &rd); @@ -85,14 +85,14 @@ static bool test_mkdir(struct smbcli_state *cli, struct torture_context *tctx) smbcli_unlink(cli->tree, path); - printf("testing invalid dir\n"); + printf("Testing invalid dir\n"); /* create an invalid dir */ md.mkdir.in.path = "..\\..\\.."; status = smb_raw_mkdir(cli->tree, &md); CHECK_STATUS(status, NT_STATUS_OBJECT_PATH_SYNTAX_BAD); - printf("testing t2mkdir\n"); + printf("Testing t2mkdir\n"); /* try a t2mkdir - need to work out why this fails! */ md.t2mkdir.level = RAW_MKDIR_T2MKDIR; @@ -104,13 +104,13 @@ static bool test_mkdir(struct smbcli_state *cli, struct torture_context *tctx) status = smb_raw_rmdir(cli->tree, &rd); CHECK_STATUS(status, NT_STATUS_OK); - printf("testing t2mkdir bad path\n"); + printf("Testing t2mkdir bad path\n"); md.t2mkdir.in.path = talloc_asprintf(tctx, "%s\\bad_path\\bad_path", BASEDIR); status = smb_raw_mkdir(cli->tree, &md); CHECK_STATUS(status, NT_STATUS_OBJECT_PATH_NOT_FOUND); - printf("testing t2mkdir with EAs\n"); + printf("Testing t2mkdir with EAs\n"); /* with EAs */ md.t2mkdir.level = RAW_MKDIR_T2MKDIR; diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c index b0764ff69c9..e8418f892c7 100644 --- a/source4/torture/raw/mux.c +++ b/source4/torture/raw/mux.c @@ -48,7 +48,7 @@ static bool test_mux_open(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) struct timeval tv; double d; - printf("testing multiplexed open/open/close\n"); + printf("Testing multiplexed open/open/close\n"); printf("send first open\n"); io.generic.level = RAW_OPEN_NTCREATEX; @@ -149,7 +149,7 @@ static bool test_mux_write(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) bool ret = true; struct smbcli_request *req; - printf("testing multiplexed lock/write/close\n"); + printf("Testing multiplexed lock/write/close\n"); fnum = smbcli_open(cli->tree, BASEDIR "\\write.dat", O_RDWR | O_CREAT, DENY_NONE); if (fnum == -1) { diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index 257cf9daf6c..5bf7f4aa3bf 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -100,14 +100,14 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2, notify.nttrans.in.file.fnum = fnum; notify.nttrans.in.recursive = true; - printf("testing notify cancel\n"); + printf("Testing notify cancel\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); smb_raw_ntcancel(req); status = smb_raw_changenotify_recv(req, mem_ctx, ¬ify); CHECK_STATUS(status, NT_STATUS_CANCELLED); - printf("testing notify mkdir\n"); + printf("Testing notify mkdir\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); smbcli_mkdir(cli2->tree, BASEDIR "\\subdir-name"); @@ -119,7 +119,7 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2, CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_ADDED); CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name", STR_UNICODE); - printf("testing notify rmdir\n"); + printf("Testing notify rmdir\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); smbcli_rmdir(cli2->tree, BASEDIR "\\subdir-name"); @@ -130,7 +130,7 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2, CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_REMOVED); CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name", STR_UNICODE); - printf("testing notify mkdir - rmdir - mkdir - rmdir\n"); + printf("Testing notify mkdir - rmdir - mkdir - rmdir\n"); smbcli_mkdir(cli2->tree, BASEDIR "\\subdir-name"); smbcli_rmdir(cli2->tree, BASEDIR "\\subdir-name"); @@ -151,7 +151,7 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2, CHECK_WSTR(notify.nttrans.out.changes[3].name, "subdir-name", STR_UNICODE); count = torture_numops; - printf("testing buffered notify on create of %d files\n", count); + printf("Testing buffered notify on create of %d files\n", count); for (i=0;i<count;i++) { char *fname = talloc_asprintf(cli, BASEDIR "\\test%d.txt", i); int fnum3 = smbcli_open(cli->tree, fname, O_CREAT|O_RDWR, DENY_NONE); @@ -181,7 +181,7 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2, /* (1st unlink) as the 2nd notify directly returns, this unlink is only seen by the 1st notify and the 3rd notify (later) */ - printf("testing notify on unlink for the first file\n"); + printf("Testing notify on unlink for the first file\n"); status = smbcli_unlink(cli2->tree, BASEDIR "\\test0.txt"); CHECK_STATUS(status, NT_STATUS_OK); @@ -208,7 +208,7 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2, status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistant.txt"); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); - printf("testing notify on wildcard unlink for %d files\n", count-1); + printf("Testing notify on wildcard unlink for %d files\n", count-1); /* (2nd unlink) do a wildcard unlink */ status = smbcli_unlink(cli2->tree, BASEDIR "\\test*.txt"); CHECK_STATUS(status, NT_STATUS_OK); @@ -239,7 +239,7 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2, CHECK_VAL(notify.nttrans.out.changes[i].action, NOTIFY_ACTION_REMOVED); } - printf("testing if a close() on the dir handle triggers the notify reply\n"); + printf("Testing if a close() on the dir handle triggers the notify reply\n"); notify.nttrans.in.file.fnum = fnum; req = smb_raw_changenotify_send(cli->tree, ¬ify); @@ -643,70 +643,70 @@ static bool test_notify_mask(struct smbcli_state *cli, struct torture_context *t } while (0); \ } while (0); - printf("testing mkdir\n"); - NOTIFY_MASK_TEST("testing mkdir",;, + printf("Testing mkdir\n"); + NOTIFY_MASK_TEST("Testing mkdir",;, smbcli_mkdir(cli->tree, BASEDIR "\\tname1");, smbcli_rmdir(cli->tree, BASEDIR "\\tname1");, NOTIFY_ACTION_ADDED, FILE_NOTIFY_CHANGE_DIR_NAME, 1); - printf("testing create file\n"); - NOTIFY_MASK_TEST("testing create file",;, + printf("Testing create file\n"); + NOTIFY_MASK_TEST("Testing create file",;, smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));, smbcli_unlink(cli->tree, BASEDIR "\\tname1");, NOTIFY_ACTION_ADDED, FILE_NOTIFY_CHANGE_FILE_NAME, 1); - printf("testing unlink\n"); - NOTIFY_MASK_TEST("testing unlink", + printf("Testing unlink\n"); + NOTIFY_MASK_TEST("Testing unlink", smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));, smbcli_unlink(cli->tree, BASEDIR "\\tname1");, ;, NOTIFY_ACTION_REMOVED, FILE_NOTIFY_CHANGE_FILE_NAME, 1); - printf("testing rmdir\n"); - NOTIFY_MASK_TEST("testing rmdir", + printf("Testing rmdir\n"); + NOTIFY_MASK_TEST("Testing rmdir", smbcli_mkdir(cli->tree, BASEDIR "\\tname1");, smbcli_rmdir(cli->tree, BASEDIR "\\tname1");, ;, NOTIFY_ACTION_REMOVED, FILE_NOTIFY_CHANGE_DIR_NAME, 1); - printf("testing rename file\n"); - NOTIFY_MASK_TEST("testing rename file", + printf("Testing rename file\n"); + NOTIFY_MASK_TEST("Testing rename file", smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));, smbcli_rename(cli->tree, BASEDIR "\\tname1", BASEDIR "\\tname2");, smbcli_unlink(cli->tree, BASEDIR "\\tname2");, NOTIFY_ACTION_OLD_NAME, FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_ATTRIBUTES|FILE_NOTIFY_CHANGE_CREATION, 2); - printf("testing rename dir\n"); - NOTIFY_MASK_TEST("testing rename dir", + printf("Testing rename dir\n"); + NOTIFY_MASK_TEST("Testing rename dir", smbcli_mkdir(cli->tree, BASEDIR "\\tname1");, smbcli_rename(cli->tree, BASEDIR "\\tname1", BASEDIR "\\tname2");, smbcli_rmdir(cli->tree, BASEDIR "\\tname2");, NOTIFY_ACTION_OLD_NAME, FILE_NOTIFY_CHANGE_DIR_NAME, 2); - printf("testing set path attribute\n"); - NOTIFY_MASK_TEST("testing set path attribute", + printf("Testing set path attribute\n"); + NOTIFY_MASK_TEST("Testing set path attribute", smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));, smbcli_setatr(cli->tree, BASEDIR "\\tname1", FILE_ATTRIBUTE_HIDDEN, 0);, smbcli_unlink(cli->tree, BASEDIR "\\tname1");, NOTIFY_ACTION_MODIFIED, FILE_NOTIFY_CHANGE_ATTRIBUTES, 1); - printf("testing set path write time\n"); - NOTIFY_MASK_TEST("testing set path write time", + printf("Testing set path write time\n"); + NOTIFY_MASK_TEST("Testing set path write time", smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));, smbcli_setatr(cli->tree, BASEDIR "\\tname1", FILE_ATTRIBUTE_NORMAL, 1000);, smbcli_unlink(cli->tree, BASEDIR "\\tname1");, NOTIFY_ACTION_MODIFIED, FILE_NOTIFY_CHANGE_LAST_WRITE, 1); - printf("testing set file attribute\n"); - NOTIFY_MASK_TEST("testing set file attribute", + printf("Testing set file attribute\n"); + NOTIFY_MASK_TEST("Testing set file attribute", fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");, smbcli_fsetatr(cli->tree, fnum2, FILE_ATTRIBUTE_HIDDEN, 0, 0, 0, 0);, (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));, @@ -718,8 +718,8 @@ static bool test_notify_mask(struct smbcli_state *cli, struct torture_context *t "everywhere\n"); } else { - printf("testing set file create time\n"); - NOTIFY_MASK_TEST("testing set file create time", + printf("Testing set file create time\n"); + NOTIFY_MASK_TEST("Testing set file create time", fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");, smbcli_fsetatr(cli->tree, fnum2, 0, t, 0, 0, 0);, @@ -729,24 +729,24 @@ static bool test_notify_mask(struct smbcli_state *cli, struct torture_context *t FILE_NOTIFY_CHANGE_CREATION, 1); } - printf("testing set file access time\n"); - NOTIFY_MASK_TEST("testing set file access time", + printf("Testing set file access time\n"); + NOTIFY_MASK_TEST("Testing set file access time", fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");, smbcli_fsetatr(cli->tree, fnum2, 0, 0, t, 0, 0);, (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));, NOTIFY_ACTION_MODIFIED, FILE_NOTIFY_CHANGE_LAST_ACCESS, 1); - printf("testing set file write time\n"); - NOTIFY_MASK_TEST("testing set file write time", + printf("Testing set file write time\n"); + NOTIFY_MASK_TEST("Testing set file write time", fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");, smbcli_fsetatr(cli->tree, fnum2, 0, 0, 0, t, 0);, (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));, NOTIFY_ACTION_MODIFIED, FILE_NOTIFY_CHANGE_LAST_WRITE, 1); - printf("testing set file change time\n"); - NOTIFY_MASK_TEST("testing set file change time", + printf("Testing set file change time\n"); + NOTIFY_MASK_TEST("Testing set file change time", fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");, smbcli_fsetatr(cli->tree, fnum2, 0, 0, 0, 0, t);, (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));, @@ -754,16 +754,16 @@ static bool test_notify_mask(struct smbcli_state *cli, struct torture_context *t 0, 1); - printf("testing write\n"); - NOTIFY_MASK_TEST("testing write", + printf("Testing write\n"); + NOTIFY_MASK_TEST("Testing write", fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");, smbcli_write(cli->tree, fnum2, 1, &c, 10000, 1);, (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));, NOTIFY_ACTION_MODIFIED, 0, 1); - printf("testing truncate\n"); - NOTIFY_MASK_TEST("testing truncate", + printf("Testing truncate\n"); + NOTIFY_MASK_TEST("Testing truncate", fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");, smbcli_ftruncate(cli->tree, fnum2, 10000);, (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));, @@ -815,7 +815,7 @@ static bool test_notify_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) notify.nttrans.in.completion_filter = FILE_NOTIFY_CHANGE_STREAM_NAME; notify.nttrans.in.recursive = false; - printf("testing if notifies on file handles are invalid (should be)\n"); + printf("Testing if notifies on file handles are invalid (should be)\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); status = smb_raw_changenotify_recv(req, mem_ctx, ¬ify); @@ -1333,7 +1333,7 @@ static bool test_notify_overflow(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) CHECK_STATUS(status, NT_STATUS_CANCELLED); /* open a lot of files, filling up the server side notify buffer */ - printf("testing overflowed buffer notify on create of %d files\n", + printf("Testing overflowed buffer notify on create of %d files\n", count); for (i=0;i<count;i++) { char *fname = talloc_asprintf(cli, BASEDIR "\\test%d.txt", i); @@ -1512,7 +1512,7 @@ static bool test_notify_tcon(struct smbcli_state *cli, struct torture_context *t notify.nttrans.in.file.fnum = fnum; notify.nttrans.in.recursive = true; - printf("testing notify mkdir\n"); + printf("Testing notify mkdir\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); smbcli_mkdir(cli->tree, BASEDIR "\\subdir-name"); @@ -1523,7 +1523,7 @@ static bool test_notify_tcon(struct smbcli_state *cli, struct torture_context *t CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_ADDED); CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name", STR_UNICODE); - printf("testing notify rmdir\n"); + printf("Testing notify rmdir\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); smbcli_rmdir(cli->tree, BASEDIR "\\subdir-name"); @@ -1538,7 +1538,7 @@ static bool test_notify_tcon(struct smbcli_state *cli, struct torture_context *t printf("TESTING WITH SECONDARY TCON\n"); tree = secondary_tcon(cli, torture); - printf("testing notify mkdir\n"); + printf("Testing notify mkdir\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); smbcli_mkdir(cli->tree, BASEDIR "\\subdir-name"); @@ -1549,7 +1549,7 @@ static bool test_notify_tcon(struct smbcli_state *cli, struct torture_context *t CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_ADDED); CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name", STR_UNICODE); - printf("testing notify rmdir\n"); + printf("Testing notify rmdir\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); smbcli_rmdir(cli->tree, BASEDIR "\\subdir-name"); @@ -1566,7 +1566,7 @@ static bool test_notify_tcon(struct smbcli_state *cli, struct torture_context *t CHECK_STATUS(status, NT_STATUS_OK); talloc_free(tree); - printf("testing notify mkdir\n"); + printf("Testing notify mkdir\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); smbcli_mkdir(cli->tree, BASEDIR "\\subdir-name"); @@ -1577,7 +1577,7 @@ static bool test_notify_tcon(struct smbcli_state *cli, struct torture_context *t CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_ADDED); CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name", STR_UNICODE); - printf("testing notify rmdir\n"); + printf("Testing notify rmdir\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); smbcli_rmdir(cli->tree, BASEDIR "\\subdir-name"); diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index 493039a307e..39516058340 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -256,7 +256,7 @@ static bool test_one_file(struct torture_context *tctx, NTSTATUS expected_status; uint32_t cap = cli->transport->negotiate.capabilities; - torture_comment(tctx, "testing %s\n", levels[i].name); + torture_comment(tctx, "Testing %s\n", levels[i].name); levels[i].status = torture_single_search(cli, tctx, fname, levels[i].level, diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c index c3a992b05fd..3b165b57cec 100644 --- a/source4/torture/rpc/alter_context.c +++ b/source4/torture/rpc/alter_context.c @@ -65,7 +65,7 @@ bool torture_rpc_alter_context(struct torture_context *torture) torture_assert_ntstatus_equal(torture, status, NT_STATUS_RPC_UNSUPPORTED_NAME_SYNTAX, "dcerpc_alter_context with wrong version should fail"); - torture_comment(torture, "testing DSSETUP pipe operations\n"); + torture_comment(torture, "Testing DSSETUP pipe operations\n"); ret &= test_DsRoleGetPrimaryDomainInformation(torture, p2); if (handle) { @@ -97,7 +97,7 @@ bool torture_rpc_alter_context(struct torture_context *torture) } torture_assert_ntstatus_ok(torture, status, "dcerpc_alter_context failed"); - torture_comment(torture, "testing DSSETUP pipe operations - should fault\n"); + torture_comment(torture, "Testing DSSETUP pipe operations - should fault\n"); ret &= test_DsRoleGetPrimaryDomainInformation_ext(torture, p, NT_STATUS_NET_WRITE_FAULT); ret &= test_lsa_OpenPolicy2(p->binding_handle, torture, &handle); @@ -106,7 +106,7 @@ bool torture_rpc_alter_context(struct torture_context *torture) ret &= test_lsa_Close(p->binding_handle, torture, handle); } - torture_comment(torture, "testing DSSETUP pipe operations\n"); + torture_comment(torture, "Testing DSSETUP pipe operations\n"); ret &= test_DsRoleGetPrimaryDomainInformation(torture, p2); diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index 42d2d1280a0..9ecd30bf173 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -76,7 +76,7 @@ bool test_DsBind(struct dcerpc_pipe *p, r.in.bind_info = &bind_info_ctr; r.out.bind_handle = &priv->bind_handle; - torture_comment(tctx, "testing DsBind\n"); + torture_comment(tctx, "Testing DsBind\n"); status = dcerpc_drsuapi_DsBind_r(p->binding_handle, tctx, &r); torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsBind"); @@ -137,7 +137,7 @@ static bool test_DsGetDomainControllerInfo(struct torture_context *tctx, r.out.level_out = &level_out; torture_comment(tctx, - "testing DsGetDomainControllerInfo level %d on domainname '%s'\n", + "Testing DsGetDomainControllerInfo level %d on domainname '%s'\n", r.in.req->req1.level, r.in.req->req1.domain_name); status = dcerpc_drsuapi_DsGetDomainControllerInfo_r(p->binding_handle, tctx, &r); @@ -191,7 +191,7 @@ static bool test_DsGetDomainControllerInfo(struct torture_context *tctx, r.in.req->req1.domain_name = "__UNKNOWN_DOMAIN__"; /* This is clearly ignored for this level */ r.in.req->req1.level = -1; - torture_comment(tctx, "testing DsGetDomainControllerInfo level %d on domainname '%s'\n", + torture_comment(tctx, "Testing DsGetDomainControllerInfo level %d on domainname '%s'\n", r.in.req->req1.level, r.in.req->req1.domain_name); status = dcerpc_drsuapi_DsGetDomainControllerInfo_r(p->binding_handle, tctx, &r); @@ -236,7 +236,7 @@ static bool test_DsWriteAccountSpn(struct torture_context *tctx, r.in.level = 1; r.in.req = &req; - torture_comment(tctx, "testing DsWriteAccountSpn\n"); + torture_comment(tctx, "Testing DsWriteAccountSpn\n"); r.in.req->req1.operation = DRSUAPI_DS_SPN_OPERATION_ADD; r.in.req->req1.unknown1 = 0; @@ -350,7 +350,7 @@ static bool test_DsReplicaGetInfo(struct torture_context *tctx, for (i=0; i < ARRAY_SIZE(array); i++) { const char *object_dn; - torture_comment(tctx, "testing DsReplicaGetInfo level %d infotype %d\n", + torture_comment(tctx, "Testing DsReplicaGetInfo level %d infotype %d\n", array[i].level, array[i].infotype); object_dn = (array[i].obj_dn ? array[i].obj_dn : priv->domain_obj_dn); @@ -425,7 +425,7 @@ static bool test_DsReplicaSync(struct torture_context *tctx, r.in.bind_handle = &priv->bind_handle; for (i=0; i < ARRAY_SIZE(array); i++) { - torture_comment(tctx, "testing DsReplicaSync level %d\n", + torture_comment(tctx, "Testing DsReplicaSync level %d\n", array[i].level); r.in.level = array[i].level; @@ -552,7 +552,7 @@ static bool test_DsGetNCChanges(struct torture_context *tctx, for (i=0; i < ARRAY_SIZE(array); i++) { torture_comment(tctx, - "testing DsGetNCChanges level %d\n", + "Testing DsGetNCChanges level %d\n", array[i].level); r.in.bind_handle = &priv->bind_handle; @@ -685,7 +685,7 @@ bool test_DsUnbind(struct dcerpc_pipe *p, r.in.bind_handle = &priv->bind_handle; r.out.bind_handle = &priv->bind_handle; - torture_comment(tctx, "testing DsUnbind\n"); + torture_comment(tctx, "Testing DsUnbind\n"); status = dcerpc_drsuapi_DsUnbind_r(p->binding_handle, tctx, &r); torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsUnbind"); diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c index 2a49fb37f74..7078dde0bc1 100644 --- a/source4/torture/rpc/drsuapi_cracknames.c +++ b/source4/torture/rpc/drsuapi_cracknames.c @@ -279,7 +279,7 @@ bool test_DsCrackNames(struct torture_context *tctx, names[0].str = dom_sid; - torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n", + torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n", names[0].str, r.in.req->req1.format_desired); status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); @@ -304,7 +304,7 @@ bool test_DsCrackNames(struct torture_context *tctx, r.in.req->req1.format_desired = DRSUAPI_DS_NAME_FORMAT_GUID; - torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n", + torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n", names[0].str, r.in.req->req1.format_desired); status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); @@ -330,7 +330,7 @@ bool test_DsCrackNames(struct torture_context *tctx, r.in.req->req1.format_desired = DRSUAPI_DS_NAME_FORMAT_FQDN_1779; - torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n", + torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n", names[0].str, r.in.req->req1.format_desired); status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); @@ -378,7 +378,7 @@ bool test_DsCrackNames(struct torture_context *tctx, r.in.req->req1.format_desired = DRSUAPI_DS_NAME_FORMAT_FQDN_1779; names[0].str = nt4_domain; - torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n", + torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n", names[0].str, r.in.req->req1.format_desired); status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); @@ -404,7 +404,7 @@ bool test_DsCrackNames(struct torture_context *tctx, r.in.req->req1.format_desired = DRSUAPI_DS_NAME_FORMAT_FQDN_1779; names[0].str = talloc_asprintf(mem_ctx, "%s%s$", nt4_domain, test_dc); - torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n", + torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n", names[0].str, r.in.req->req1.format_desired); status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); @@ -430,7 +430,7 @@ bool test_DsCrackNames(struct torture_context *tctx, r.in.req->req1.format_desired = DRSUAPI_DS_NAME_FORMAT_FQDN_1779; names[0].str = priv->domain_guid_str; - torture_comment(tctx, "testing DsCrackNames with name '%s' desired format:%d\n", + torture_comment(tctx, "Testing DsCrackNames with name '%s' desired format:%d\n", names[0].str, r.in.req->req1.format_desired); status = dcerpc_drsuapi_DsCrackNames_r(p->binding_handle, mem_ctx, &r); diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c index 7fdbdc470af..b01dd773a66 100644 --- a/source4/torture/rpc/dsgetinfo.c +++ b/source4/torture/rpc/dsgetinfo.c @@ -302,7 +302,7 @@ static bool test_getinfo(struct torture_context *tctx, for (i=0; i < ARRAY_SIZE(array); i++) { const char *object_dn; - torture_comment(tctx, "testing DsReplicaGetInfo level %d infotype %d\n", + torture_comment(tctx, "Testing DsReplicaGetInfo level %d infotype %d\n", array[i].level, array[i].infotype); if (array[i].obj_dn) { diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c index 337f5e322a4..793ab14dbf0 100644 --- a/source4/torture/rpc/dssync.c +++ b/source4/torture/rpc/dssync.c @@ -806,7 +806,7 @@ static bool test_FetchData(struct torture_context *tctx, struct DsSyncTest *ctx) } for (i=0; i < ARRAY_SIZE(array); i++) { - printf("testing DsGetNCChanges level %d\n", + printf("Testing DsGetNCChanges level %d\n", array[i].level); r.in.bind_handle = &ctx->new_dc.drsuapi.bind_handle; diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index 23239205816..7dd2cef19fa 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -2962,7 +2962,7 @@ static bool testcase_TrustedDomains(struct torture_context *tctx, talloc_get_type_abort(data, struct lsa_trustdom_state); struct dcerpc_binding_handle *b = p->binding_handle; - torture_comment(tctx, "testing %d domains\n", state->num_trusts); + torture_comment(tctx, "Testing %d domains\n", state->num_trusts); if (!test_OpenPolicy(b, tctx)) { ret = false; diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index 0034cdcf571..c469de9ec99 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -1693,7 +1693,7 @@ static bool test_LogonControl(struct torture_context *tctx, secure_channel_type = cli_credentials_get_secure_channel_type(machine_credentials); } - torture_comment(tctx, "testing LogonControl with secure channel type: %d\n", + torture_comment(tctx, "Testing LogonControl with secure channel type: %d\n", secure_channel_type); r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p)); diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index baf4501469c..274ddd9ea80 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -1970,7 +1970,7 @@ static bool test_NetShareGetInfo(struct torture_context *tctx, for (i=0;i<ARRAY_SIZE(levels);i++) { r.in.level = levels[i]; - torture_comment(tctx, "testing NetShareGetInfo level %u on share '%s'\n", + torture_comment(tctx, "Testing NetShareGetInfo level %u on share '%s'\n", r.in.level, r.in.share_name); status = dcerpc_srvsvc_NetShareGetInfo_r(b, tctx, &r); @@ -2066,7 +2066,7 @@ static bool test_NetShareEnum(struct torture_context *tctx, break; } - torture_comment(tctx, "testing NetShareEnum level %u\n", info_ctr.level); + torture_comment(tctx, "Testing NetShareEnum level %u\n", info_ctr.level); status = dcerpc_srvsvc_NetShareEnum_r(b, tctx, &r); if (!NT_STATUS_IS_OK(status)) { diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c index 1ccbd3e05ee..7282750c974 100644 --- a/source4/torture/rpc/samlogon.c +++ b/source4/torture/rpc/samlogon.c @@ -1358,7 +1358,7 @@ static bool test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, ZERO_STRUCT(logon); - d_printf("testing netr_LogonSamLogon and netr_LogonSamLogonWithFlags\n"); + d_printf("Testing netr_LogonSamLogon and netr_LogonSamLogonWithFlags\n"); samlogon_state.comment = comment; samlogon_state.account_name = account_name; diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index d40d1629345..a0a5e5f6d90 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -130,7 +130,7 @@ static bool test_Shutdown(struct dcerpc_binding_handle *b, r.in.connect_handle = handle; - torture_comment(tctx, "testing samr_Shutdown\n"); + torture_comment(tctx, "Testing samr_Shutdown\n"); torture_assert_ntstatus_ok(tctx, dcerpc_samr_Shutdown_r(b, tctx, &r), "Shutdown failed"); @@ -159,7 +159,7 @@ static bool test_SetDsrmPassword(struct dcerpc_binding_handle *b, r.in.unknown = 0; r.in.hash = &hash; - torture_comment(tctx, "testing samr_SetDsrmPassword\n"); + torture_comment(tctx, "Testing samr_SetDsrmPassword\n"); torture_assert_ntstatus_ok(tctx, dcerpc_samr_SetDsrmPassword_r(b, tctx, &r), "SetDsrmPassword failed"); @@ -1411,7 +1411,7 @@ static bool test_GetGroupsForUser(struct dcerpc_binding_handle *b, struct samr_GetGroupsForUser r; struct samr_RidWithAttributeArray *rids = NULL; - torture_comment(tctx, "testing GetGroupsForUser\n"); + torture_comment(tctx, "Testing GetGroupsForUser\n"); r.in.user_handle = user_handle; r.out.rids = &rids; @@ -2633,7 +2633,7 @@ static bool test_AddMemberToAlias(struct dcerpc_binding_handle *b, sid = dom_sid_add_rid(tctx, domain_sid, 512); - torture_comment(tctx, "testing AddAliasMember\n"); + torture_comment(tctx, "Testing AddAliasMember\n"); r.in.alias_handle = alias_handle; r.in.sid = sid; @@ -2659,7 +2659,7 @@ static bool test_AddMultipleMembersToAlias(struct dcerpc_binding_handle *b, struct samr_RemoveMultipleMembersFromAlias r; struct lsa_SidArray sids; - torture_comment(tctx, "testing AddMultipleMembersToAlias\n"); + torture_comment(tctx, "Testing AddMultipleMembersToAlias\n"); a.in.alias_handle = alias_handle; a.in.sids = &sids; @@ -2675,7 +2675,7 @@ static bool test_AddMultipleMembersToAlias(struct dcerpc_binding_handle *b, torture_assert_ntstatus_ok(tctx, a.out.result, "AddMultipleMembersToAlias"); - torture_comment(tctx, "testing RemoveMultipleMembersFromAlias\n"); + torture_comment(tctx, "Testing RemoveMultipleMembersFromAlias\n"); r.in.alias_handle = alias_handle; r.in.sids = &sids; @@ -2982,7 +2982,7 @@ static bool test_SamLogon_with_creds(struct torture_context *tctx, cli_credentials_set_password(test_credentials, password, CRED_SPECIFIED); - torture_comment(tctx, "testing samlogon (%s) as %s password: %s\n", + torture_comment(tctx, "Testing samlogon (%s) as %s password: %s\n", interactive ? "interactive" : "network", acct_name, password); if (!test_SamLogon(tctx, p, test_credentials, @@ -4995,7 +4995,7 @@ static bool test_DeleteAlias_byname(struct dcerpc_binding_handle *b, struct policy_handle alias_handle; uint32_t rid; - torture_comment(tctx, "testing DeleteAlias_byname\n"); + torture_comment(tctx, "Testing DeleteAlias_byname\n"); status = test_LookupName(b, tctx, domain_handle, name, &rid); if (!NT_STATUS_IS_OK(status)) { @@ -5168,7 +5168,7 @@ static bool test_ChangePassword(struct dcerpc_pipe *p, r.in.level = 1; r.out.info = &info; - torture_comment(tctx, "testing samr_QueryDomainInfo level 1\n"); + torture_comment(tctx, "Testing samr_QueryDomainInfo level 1\n"); torture_assert_ntstatus_ok(tctx, dcerpc_samr_QueryDomainInfo_r(b, tctx, &r), "QueryDomainInfo failed"); if (!NT_STATUS_IS_OK(r.out.result)) { @@ -5189,7 +5189,7 @@ static bool test_ChangePassword(struct dcerpc_pipe *p, min_pwd_age_old = s.in.info->info1.min_password_age; s.in.info->info1.min_password_age = 0; - torture_comment(tctx, "testing samr_SetDomainInfo level 1\n"); + torture_comment(tctx, "Testing samr_SetDomainInfo level 1\n"); torture_assert_ntstatus_ok(tctx, dcerpc_samr_SetDomainInfo_r(b, tctx, &s), "SetDomainInfo failed"); if (!NT_STATUS_IS_OK(s.out.result)) { @@ -5206,7 +5206,7 @@ static bool test_ChangePassword(struct dcerpc_pipe *p, s.in.info->info1.password_properties = pwd_prop_old; s.in.info->info1.min_password_age = min_pwd_age_old; - torture_comment(tctx, "testing samr_SetDomainInfo level 1\n"); + torture_comment(tctx, "Testing samr_SetDomainInfo level 1\n"); torture_assert_ntstatus_ok(tctx, dcerpc_samr_SetDomainInfo_r(b, tctx, &s), "SetDomainInfo failed"); if (!NT_STATUS_IS_OK(s.out.result)) { @@ -7788,7 +7788,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b, uint32_t level_out = 0; bool ret = true, got_handle = false; - torture_comment(tctx, "testing samr_Connect\n"); + torture_comment(tctx, "Testing samr_Connect\n"); r.in.system_name = 0; r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; @@ -7804,7 +7804,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b, *handle = h; } - torture_comment(tctx, "testing samr_Connect2\n"); + torture_comment(tctx, "Testing samr_Connect2\n"); r2.in.system_name = NULL; r2.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; @@ -7823,7 +7823,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b, *handle = h; } - torture_comment(tctx, "testing samr_Connect3\n"); + torture_comment(tctx, "Testing samr_Connect3\n"); r3.in.system_name = NULL; r3.in.unknown = 0; @@ -7843,7 +7843,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b, *handle = h; } - torture_comment(tctx, "testing samr_Connect4\n"); + torture_comment(tctx, "Testing samr_Connect4\n"); r4.in.system_name = ""; r4.in.client_version = 0; @@ -7863,7 +7863,7 @@ static bool test_Connect(struct dcerpc_binding_handle *b, *handle = h; } - torture_comment(tctx, "testing samr_Connect5\n"); + torture_comment(tctx, "Testing samr_Connect5\n"); info.info1.client_version = 0; info.info1.unknown2 = 0; @@ -7904,7 +7904,7 @@ static bool test_samr_ValidatePassword(struct dcerpc_pipe *p, int i; struct dcerpc_binding_handle *b = p->binding_handle; - torture_comment(tctx, "testing samr_ValidatePassword\n"); + torture_comment(tctx, "Testing samr_ValidatePassword\n"); ZERO_STRUCT(r); r.in.level = NetValidatePasswordReset; diff --git a/source4/torture/rpc/samr_accessmask.c b/source4/torture/rpc/samr_accessmask.c index 7c24c5e23a9..fc331e2d855 100644 --- a/source4/torture/rpc/samr_accessmask.c +++ b/source4/torture/rpc/samr_accessmask.c @@ -84,10 +84,10 @@ static bool test_samr_accessmask_Connect5(struct torture_context *tctx, uint32_t mask; struct dcerpc_binding_handle *b = p->binding_handle; - printf("testing which bits in accessmask allows us to connect\n"); + printf("Testing which bits in accessmask allows us to connect\n"); mask = 1; for (i=0;i<33;i++) { - printf("testing Connect5 with access mask 0x%08x", mask); + printf("Testing Connect5 with access mask 0x%08x", mask); status = torture_samr_Connect5(tctx, b, mask, &h); mask <<= 1; @@ -159,10 +159,10 @@ static bool test_samr_accessmask_EnumDomains(struct torture_context *tctx, uint32_t num_entries = 0; struct dcerpc_binding_handle *b = p->binding_handle; - printf("testing which bits in Connect5 accessmask allows us to EnumDomains\n"); + printf("Testing which bits in Connect5 accessmask allows us to EnumDomains\n"); mask = 1; for (i=0;i<33;i++) { - printf("testing Connect5/EnumDomains with access mask 0x%08x", mask); + printf("Testing Connect5/EnumDomains with access mask 0x%08x", mask); status = torture_samr_Connect5(tctx, b, mask, &ch); mask <<= 1; @@ -260,7 +260,7 @@ static bool test_samr_connect_user_acl(struct torture_context *tctx, struct dcerpc_binding_handle *test_b; const char *binding = torture_setting_string(tctx, "binding", NULL); - printf("testing ACLs to allow/prevent users to connect to SAMR"); + printf("Testing ACLs to allow/prevent users to connect to SAMR"); /* connect to SAMR */ status = torture_samr_Connect5(tctx, b, SEC_FLAG_MAXIMUM_ALLOWED, &ch); @@ -378,7 +378,7 @@ static bool test_samr_connect_user_acl_enforced(struct torture_context *tctx, struct dcerpc_binding_handle *test_b; const char *binding = torture_setting_string(tctx, "binding", NULL); - printf("testing if ACLs are enforced for non domain admin users when connecting to SAMR"); + printf("Testing if ACLs are enforced for non domain admin users when connecting to SAMR"); status = dcerpc_pipe_connect(tctx, @@ -425,10 +425,10 @@ static bool test_samr_accessmask_LookupDomain(struct torture_context *tctx, uint32_t mask; struct dcerpc_binding_handle *b = p->binding_handle; - printf("testing which bits in Connect5 accessmask allows us to LookupDomain\n"); + printf("Testing which bits in Connect5 accessmask allows us to LookupDomain\n"); mask = 1; for (i=0;i<33;i++) { - printf("testing Connect5/LookupDomain with access mask 0x%08x", mask); + printf("Testing Connect5/LookupDomain with access mask 0x%08x", mask); status = torture_samr_Connect5(tctx, b, mask, &ch); mask <<= 1; @@ -538,10 +538,10 @@ static bool test_samr_accessmask_OpenDomain(struct torture_context *tctx, - printf("testing which bits in Connect5 accessmask allows us to OpenDomain\n"); + printf("Testing which bits in Connect5 accessmask allows us to OpenDomain\n"); mask = 1; for (i=0;i<33;i++) { - printf("testing Connect5/OpenDomain with access mask 0x%08x", mask); + printf("Testing Connect5/OpenDomain with access mask 0x%08x", mask); status = torture_samr_Connect5(tctx, b, mask, &ch); mask <<= 1; @@ -700,7 +700,7 @@ static bool test_LookupRids(struct torture_context *tctx, struct lsa_Strings names; struct samr_Ids types; - torture_comment(tctx, "testing LookupRids %d\n", rid); + torture_comment(tctx, "Testing LookupRids %d\n", rid); r.in.domain_handle = domain_handle; r.in.num_rids = 1; @@ -725,7 +725,7 @@ static bool test_user(struct torture_context *tctx, { struct policy_handle user_handle; - torture_comment(tctx, "testing user %s (%d)\n", u->account_name.string, u->rid); + torture_comment(tctx, "Testing user %s (%d)\n", u->account_name.string, u->rid); torture_assert(tctx, test_LookupRids(tctx, b, domain_handle, u->rid), "failed to call lookuprids"); @@ -756,7 +756,7 @@ static bool test_user(struct torture_context *tctx, r.in.level = levels[i]; - torture_comment(tctx, "testing QueryUserInfo rid: %d level: %d\n", + torture_comment(tctx, "Testing QueryUserInfo rid: %d level: %d\n", u->rid, r.in.level); torture_assert_ntstatus_ok(tctx, dcerpc_samr_QueryUserInfo_r(b, tctx, &r), @@ -793,7 +793,7 @@ static bool test_samr_group(struct torture_context *tctx, { struct policy_handle group_handle; - torture_comment(tctx, "testing group %s (%d)\n", g->name.string, g->idx); + torture_comment(tctx, "Testing group %s (%d)\n", g->name.string, g->idx); torture_assert(tctx, test_LookupRids(tctx, b, domain_handle, g->idx), "failed to call lookuprids"); @@ -836,7 +836,7 @@ static bool test_samr_alias(struct torture_context *tctx, struct policy_handle *domain_handle, struct samr_SamEntry *a) { - torture_comment(tctx, "testing alias %s (%d)\n", a->name.string, a->idx); + torture_comment(tctx, "Testing alias %s (%d)\n", a->name.string, a->idx); torture_assert(tctx, test_LookupRids(tctx, b, domain_handle, a->idx), "failed to call lookuprids"); diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 4f4e7324507..19647f3acde 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -4664,7 +4664,7 @@ static bool test_SecondaryClosePrinter(struct torture_context *tctx, return true; } - torture_comment(tctx, "testing close on secondary pipe\n"); + torture_comment(tctx, "Testing close on secondary pipe\n"); status = dcerpc_parse_binding(tctx, p->conn->binding_string, &b); torture_assert_ntstatus_ok(tctx, status, "Failed to parse dcerpc binding"); diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c index 0942258156c..9bcc95b191e 100644 --- a/source4/torture/rpc/srvsvc.c +++ b/source4/torture/rpc/srvsvc.c @@ -41,7 +41,7 @@ static bool test_NetCharDevGetInfo(struct dcerpc_pipe *p, struct torture_context for (i=0;i<ARRAY_SIZE(levels);i++) { r.in.level = levels[i]; - torture_comment(tctx, "testing NetCharDevGetInfo level %u on device '%s'\n", + torture_comment(tctx, "Testing NetCharDevGetInfo level %u on device '%s'\n", r.in.level, r.in.device_name); status = dcerpc_srvsvc_NetCharDevGetInfo_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetCharDevGetInfo failed"); @@ -66,7 +66,7 @@ static bool test_NetCharDevControl(struct dcerpc_pipe *p, struct torture_context for (i=0;i<ARRAY_SIZE(opcodes);i++) { ZERO_STRUCT(r.out); r.in.opcode = opcodes[i]; - torture_comment(tctx, "testing NetCharDevControl opcode %u on device '%s'\n", + torture_comment(tctx, "Testing NetCharDevControl opcode %u on device '%s'\n", r.in.opcode, r.in.device_name); status = dcerpc_srvsvc_NetCharDevControl_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetCharDevControl failed"); @@ -114,7 +114,7 @@ static bool test_NetCharDevEnum(struct torture_context *tctx, break; } - torture_comment(tctx, "testing NetCharDevEnum level %u\n", info_ctr.level); + torture_comment(tctx, "Testing NetCharDevEnum level %u\n", info_ctr.level); status = dcerpc_srvsvc_NetCharDevEnum_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetCharDevEnum failed"); if (!W_ERROR_IS_OK(r.out.result)) { @@ -160,7 +160,7 @@ static bool test_NetCharDevQGetInfo(struct dcerpc_pipe *p, struct torture_contex for (i=0;i<ARRAY_SIZE(levels);i++) { r.in.level = levels[i]; - torture_comment(tctx, "testing NetCharDevQGetInfo level %u on devicequeue '%s'\n", + torture_comment(tctx, "Testing NetCharDevQGetInfo level %u on devicequeue '%s'\n", r.in.level, r.in.queue_name); status = dcerpc_srvsvc_NetCharDevQGetInfo_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetCharDevQGetInfo failed"); @@ -264,7 +264,7 @@ static bool test_NetCharDevQEnum(struct torture_context *tctx, info_ctr.ctr.ctr1 = &c1; break; } - torture_comment(tctx, "testing NetCharDevQEnum level %u\n", info_ctr.level); + torture_comment(tctx, "Testing NetCharDevQEnum level %u\n", info_ctr.level); status = dcerpc_srvsvc_NetCharDevQEnum_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetCharDevQEnum failed"); if (!W_ERROR_IS_OK(r.out.result)) { @@ -327,7 +327,7 @@ static bool test_NetConnEnum(struct torture_context *tctx, break; } - torture_comment(tctx, "testing NetConnEnum level %u\n", info_ctr.level); + torture_comment(tctx, "Testing NetConnEnum level %u\n", info_ctr.level); status = dcerpc_srvsvc_NetConnEnum_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetConnEnum failed"); if (!W_ERROR_IS_OK(r.out.result)) { @@ -378,7 +378,7 @@ static bool test_NetFileEnum(struct torture_context *tctx, info_ctr.ctr.ctr3 = &c3; break; } - torture_comment(tctx, "testing NetFileEnum level %u\n", info_ctr.level); + torture_comment(tctx, "Testing NetFileEnum level %u\n", info_ctr.level); status = dcerpc_srvsvc_NetFileEnum_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetFileEnum failed"); if (!W_ERROR_IS_OK(r.out.result)) { @@ -445,7 +445,7 @@ static bool test_NetSessEnum(struct torture_context *tctx, break; } - torture_comment(tctx, "testing NetSessEnum level %u\n", info_ctr.level); + torture_comment(tctx, "Testing NetSessEnum level %u\n", info_ctr.level); status = dcerpc_srvsvc_NetSessEnum_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetSessEnum failed"); if (!W_ERROR_IS_OK(r.out.result)) { @@ -472,7 +472,7 @@ static bool test_NetShareCheck(struct dcerpc_pipe *p, struct torture_context *tc r.out.type = &type; torture_comment(tctx, - "testing NetShareCheck on device '%s'\n", r.in.device_name); + "Testing NetShareCheck on device '%s'\n", r.in.device_name); status = dcerpc_srvsvc_NetShareCheck_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "dcerpc_srvsvc_NetShareCheck failed"); @@ -514,7 +514,7 @@ static bool test_NetShareGetInfo(struct torture_context *tctx, expected = levels[i].anon_status; if (admin) expected = levels[i].admin_status; - torture_comment(tctx, "testing NetShareGetInfo level %u on share '%s'\n", + torture_comment(tctx, "Testing NetShareGetInfo level %u on share '%s'\n", r.in.level, r.in.share_name); status = dcerpc_srvsvc_NetShareGetInfo_r(b, tctx, &r); @@ -602,7 +602,7 @@ static bool test_NetShareAddSetDel(struct torture_context *tctx, r.in.level = levels[i].level; ZERO_STRUCT(r.out); - torture_comment(tctx, "testing NetShareSetInfo level %u on share '%s'\n", + torture_comment(tctx, "Testing NetShareSetInfo level %u on share '%s'\n", r.in.level, r.in.share_name); switch (levels[i].level) { @@ -808,7 +808,7 @@ static bool test_NetShareEnumAll(struct torture_context *tctx, resume_handle = 0; - torture_comment(tctx, "testing NetShareEnumAll level %u\n", info_ctr.level); + torture_comment(tctx, "Testing NetShareEnumAll level %u\n", info_ctr.level); status = dcerpc_srvsvc_NetShareEnumAll_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetShareEnumAll failed"); torture_assert_werr_equal(tctx, r.out.result, expected, "NetShareEnumAll failed"); @@ -904,7 +904,7 @@ static bool test_NetShareEnum(struct torture_context *tctx, expected = levels[i].anon_status; if (admin) expected = levels[i].admin_status; - torture_comment(tctx, "testing NetShareEnum level %u\n", info_ctr.level); + torture_comment(tctx, "Testing NetShareEnum level %u\n", info_ctr.level); status = dcerpc_srvsvc_NetShareEnum_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetShareEnum failed"); torture_assert_werr_equal(tctx, r.out.result, expected, "NetShareEnum failed"); @@ -943,7 +943,7 @@ static bool test_NetSrvGetInfo(struct torture_context *tctx, for (i=0;i<ARRAY_SIZE(levels);i++) { r.in.level = levels[i]; r.out.info = &info; - torture_comment(tctx, "testing NetSrvGetInfo level %u\n", r.in.level); + torture_comment(tctx, "Testing NetSrvGetInfo level %u\n", r.in.level); status = dcerpc_srvsvc_NetSrvGetInfo_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetSrvGetInfo failed"); if (!W_ERROR_IS_OK(r.out.result)) { @@ -981,7 +981,7 @@ static bool test_NetDiskEnum(struct torture_context *tctx, for (i=0;i<ARRAY_SIZE(levels);i++) { ZERO_STRUCTP(r.out.info); r.in.level = levels[i]; - torture_comment(tctx, "testing NetDiskEnum level %u\n", r.in.level); + torture_comment(tctx, "Testing NetDiskEnum level %u\n", r.in.level); status = dcerpc_srvsvc_NetDiskEnum_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetDiskEnum failed"); torture_assert_werr_ok(tctx, r.out.result, "NetDiskEnum failed"); @@ -1028,7 +1028,7 @@ static bool test_NetTransportEnum(struct torture_context *tctx, transports.ctr.ctr1 = &ctr1; break; } - torture_comment(tctx, "testing NetTransportEnum level %u\n", transports.level); + torture_comment(tctx, "Testing NetTransportEnum level %u\n", transports.level); status = dcerpc_srvsvc_NetTransportEnum_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetTransportEnum failed"); if (!W_ERROR_IS_OK(r.out.result)) { @@ -1053,7 +1053,7 @@ static bool test_NetRemoteTOD(struct torture_context *tctx, r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p)); r.out.info = &info; - torture_comment(tctx, "testing NetRemoteTOD\n"); + torture_comment(tctx, "Testing NetRemoteTOD\n"); status = dcerpc_srvsvc_NetRemoteTOD_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetRemoteTOD failed"); torture_assert_werr_ok(tctx, r.out.result, "NetRemoteTOD failed"); @@ -1078,7 +1078,7 @@ static bool test_NetNameValidate(struct torture_context *tctx, r.in.server_unc = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p)); r.in.flags = 0x0; - d_printf("testing NetNameValidate\n"); + d_printf("Testing NetNameValidate\n"); /* valid path types only between 1 and 13 */ for (i = 1; i < 14; i++) { diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c index d589d4bd33e..33789941bca 100644 --- a/source4/torture/rpc/wkssvc.c +++ b/source4/torture/rpc/wkssvc.c @@ -49,7 +49,7 @@ static bool test_NetWkstaGetInfo(struct torture_context *tctx, for (i=0;i<ARRAY_SIZE(levels);i++) { r.in.level = levels[i]; - torture_comment(tctx, "testing NetWkstaGetInfo level %u\n", + torture_comment(tctx, "Testing NetWkstaGetInfo level %u\n", r.in.level); status = dcerpc_wkssvc_NetWkstaGetInfo_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -89,7 +89,7 @@ static bool test_NetWkstaTransportEnum(struct torture_context *tctx, r.out.info = &info; r.out.resume_handle = &resume_handle; - torture_comment(tctx, "testing NetWkstaTransportEnum level 0\n"); + torture_comment(tctx, "Testing NetWkstaTransportEnum level 0\n"); status = dcerpc_wkssvc_NetWkstaTransportEnum_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -123,7 +123,7 @@ static bool test_NetrWkstaTransportAdd(struct torture_context *tctx, r.in.info0 = &info0; r.in.parm_err = r.out.parm_err = &parm_err; - torture_comment(tctx, "testing NetrWkstaTransportAdd level 0\n"); + torture_comment(tctx, "Testing NetrWkstaTransportAdd level 0\n"); status = dcerpc_wkssvc_NetrWkstaTransportAdd_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -146,7 +146,7 @@ static bool test_NetrWkstaTransportDel(struct torture_context *tctx, r.in.transport_name = SMBTORTURE_TRANSPORT_NAME; r.in.unknown3 = 0; - torture_comment(tctx, "testing NetrWkstaTransportDel\n"); + torture_comment(tctx, "Testing NetrWkstaTransportDel\n"); status = dcerpc_wkssvc_NetrWkstaTransportDel_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -198,7 +198,7 @@ static bool test_NetWkstaEnumUsers(struct torture_context *tctx, r.out.entries_read = &entries_read; - torture_comment(tctx, "testing NetWkstaEnumUsers level %u\n", + torture_comment(tctx, "Testing NetWkstaEnumUsers level %u\n", levels[i]); status = dcerpc_wkssvc_NetWkstaEnumUsers_r(b, tctx, &r); @@ -244,7 +244,7 @@ static bool test_NetrWkstaUserGetInfo(struct torture_context *tctx, r.in.level = tests[i].level; r.out.info = &info; - torture_comment(tctx, "testing NetrWkstaUserGetInfo level %u\n", + torture_comment(tctx, "Testing NetrWkstaUserGetInfo level %u\n", r.in.level); status = dcerpc_wkssvc_NetrWkstaUserGetInfo_r(b, tctx, &r); @@ -302,7 +302,7 @@ static bool test_NetrUseEnum(struct torture_context *tctx, r.out.entries_read = &entries_read; - torture_comment(tctx, "testing NetrUseEnum level %u\n", + torture_comment(tctx, "Testing NetrUseEnum level %u\n", levels[i]); status = dcerpc_wkssvc_NetrUseEnum_r(b, tctx, &r); @@ -340,7 +340,7 @@ static bool test_NetrUseAdd(struct torture_context *tctx, r.in.ctr = ctr; r.in.parm_err = r.out.parm_err = &parm_err; - torture_comment(tctx, "testing NetrUseAdd level %u\n", + torture_comment(tctx, "Testing NetrUseAdd level %u\n", r.in.level); status = dcerpc_wkssvc_NetrUseAdd_r(b, tctx, &r); @@ -363,7 +363,7 @@ static bool test_NetrUseAdd(struct torture_context *tctx, r.in.ctr = ctr; r.in.parm_err = r.out.parm_err = &parm_err; - torture_comment(tctx, "testing NetrUseAdd level %u\n", + torture_comment(tctx, "Testing NetrUseAdd level %u\n", r.in.level); status = dcerpc_wkssvc_NetrUseAdd_r(b, tctx, &r); @@ -386,7 +386,7 @@ static bool test_NetrUseDel(struct torture_context *tctx, r.in.use_name = SMBTORTURE_USE_NAME; r.in.force_cond = 0; - torture_comment(tctx, "testing NetrUseDel\n"); + torture_comment(tctx, "Testing NetrUseDel\n"); status = dcerpc_wkssvc_NetrUseDel_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -497,7 +497,7 @@ static bool test_NetrLogonDomainNameAdd(struct torture_context *tctx, r.in.domain_name = lp_workgroup(tctx->lp_ctx); - torture_comment(tctx, "testing NetrLogonDomainNameAdd\n"); + torture_comment(tctx, "Testing NetrLogonDomainNameAdd\n"); status = dcerpc_wkssvc_NetrLogonDomainNameAdd_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -516,7 +516,7 @@ static bool test_NetrLogonDomainNameDel(struct torture_context *tctx, r.in.domain_name = lp_workgroup(tctx->lp_ctx); - torture_comment(tctx, "testing NetrLogonDomainNameDel\n"); + torture_comment(tctx, "Testing NetrLogonDomainNameDel\n"); status = dcerpc_wkssvc_NetrLogonDomainNameDel_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -545,7 +545,7 @@ static bool test_NetrEnumerateComputerNames_level(struct torture_context *tctx, r.in.Reserved = 0; r.out.ctr = &ctr; - torture_comment(tctx, "testing NetrEnumerateComputerNames level %u\n", + torture_comment(tctx, "Testing NetrEnumerateComputerNames level %u\n", r.in.name_type); status = dcerpc_wkssvc_NetrEnumerateComputerNames_r(b, tctx, &r); @@ -615,7 +615,7 @@ static bool test_NetrValidateName(struct torture_context *tctx, r.in.Password = NULL; r.in.name_type = levels[i]; - torture_comment(tctx, "testing NetrValidateName level %u\n", + torture_comment(tctx, "Testing NetrValidateName level %u\n", r.in.name_type); status = dcerpc_wkssvc_NetrValidateName_r(b, tctx, &r); @@ -646,7 +646,7 @@ static bool test_NetrValidateName2(struct torture_context *tctx, r.in.EncryptedPassword = NULL; r.in.name_type = levels[i]; - torture_comment(tctx, "testing NetrValidateName2 level %u\n", + torture_comment(tctx, "Testing NetrValidateName2 level %u\n", r.in.name_type); status = dcerpc_wkssvc_NetrValidateName2_r(b, tctx, &r); @@ -676,7 +676,7 @@ static bool test_NetrAddAlternateComputerName(struct torture_context *tctx, r.in.EncryptedPassword = NULL; r.in.Reserved = 0; - torture_comment(tctx, "testing NetrAddAlternateComputerName\n"); + torture_comment(tctx, "Testing NetrAddAlternateComputerName\n"); status = dcerpc_wkssvc_NetrAddAlternateComputerName_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -718,7 +718,7 @@ static bool test_NetrRemoveAlternateComputerName(struct torture_context *tctx, r.in.EncryptedPassword = NULL; r.in.Reserved = 0; - torture_comment(tctx, "testing NetrRemoveAlternateComputerName\n"); + torture_comment(tctx, "Testing NetrRemoveAlternateComputerName\n"); status = dcerpc_wkssvc_NetrRemoveAlternateComputerName_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -783,7 +783,7 @@ static bool test_NetrSetPrimaryComputername(struct torture_context *tctx, const char **names_o = NULL, **names = NULL; int num_names_o = 0, num_names = 0; - torture_comment(tctx, "testing NetrSetPrimaryComputername\n"); + torture_comment(tctx, "Testing NetrSetPrimaryComputername\n"); if (!test_NetrAddAlternateComputerName(tctx, p)) { return false; @@ -851,7 +851,7 @@ static bool test_NetrRenameMachineInDomain(struct torture_context *tctx, r.in.password = NULL; r.in.RenameOptions = 0; - torture_comment(tctx, "testing NetrRenameMachineInDomain\n"); + torture_comment(tctx, "Testing NetrRenameMachineInDomain\n"); status = dcerpc_wkssvc_NetrRenameMachineInDomain_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -889,7 +889,7 @@ static bool test_NetrRenameMachineInDomain2(struct torture_context *tctx, const char **names_o = NULL, **names = NULL; int num_names_o = 0, num_names = 0; - torture_comment(tctx, "testing NetrRenameMachineInDomain2\n"); + torture_comment(tctx, "Testing NetrRenameMachineInDomain2\n"); if (!test_NetrEnumerateComputerNames_level(tctx, p, NetPrimaryComputerName, @@ -967,7 +967,7 @@ static bool test_NetrWorkstationStatisticsGet(struct torture_context *tctx, r.in.server_name = dcerpc_server_name(p); r.out.info = &info; - torture_comment(tctx, "testing NetrWorkstationStatisticsGet\n"); + torture_comment(tctx, "Testing NetrWorkstationStatisticsGet\n"); status = dcerpc_wkssvc_NetrWorkstationStatisticsGet_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -999,7 +999,7 @@ static bool test_NetrMessageBufferSend(struct torture_context *tctx, r.in.message_buffer = (uint8_t *)msg; r.in.message_size = size; - torture_comment(tctx, "testing NetrMessageBufferSend\n"); + torture_comment(tctx, "Testing NetrMessageBufferSend\n"); status = dcerpc_wkssvc_NetrMessageBufferSend_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -1022,7 +1022,7 @@ static bool test_NetrGetJoinInformation(struct torture_context *tctx, r.in.name_buffer = r.out.name_buffer = &name_buffer; r.out.name_type = &join_status; - torture_comment(tctx, "testing NetrGetJoinInformation\n"); + torture_comment(tctx, "Testing NetrGetJoinInformation\n"); status = dcerpc_wkssvc_NetrGetJoinInformation_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -1081,7 +1081,7 @@ static bool test_NetrGetJoinableOus(struct torture_context *tctx, r.in.num_ous = r.out.num_ous = &num_ous; r.out.ous = &ous; - torture_comment(tctx, "testing NetrGetJoinableOus\n"); + torture_comment(tctx, "Testing NetrGetJoinableOus\n"); status = dcerpc_wkssvc_NetrGetJoinableOus_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetrGetJoinableOus failed"); @@ -1108,7 +1108,7 @@ static bool test_NetrGetJoinableOus2(struct torture_context *tctx, r.in.num_ous = r.out.num_ous = &num_ous; r.out.ous = &ous; - torture_comment(tctx, "testing NetrGetJoinableOus2\n"); + torture_comment(tctx, "Testing NetrGetJoinableOus2\n"); status = dcerpc_wkssvc_NetrGetJoinableOus2_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "NetrGetJoinableOus2 failed"); @@ -1138,7 +1138,7 @@ static bool test_NetrUnjoinDomain(struct torture_context *tctx, r.in.password = NULL; r.in.unjoin_flags = 0; - torture_comment(tctx, "testing NetrUnjoinDomain\n"); + torture_comment(tctx, "Testing NetrUnjoinDomain\n"); status = dcerpc_wkssvc_NetrUnjoinDomain_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -1169,7 +1169,7 @@ static bool test_NetrJoinDomain(struct torture_context *tctx, r.in.password = NULL; r.in.join_flags = 0; - torture_comment(tctx, "testing NetrJoinDomain\n"); + torture_comment(tctx, "Testing NetrJoinDomain\n"); status = dcerpc_wkssvc_NetrJoinDomain_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -1252,7 +1252,7 @@ static bool test_NetrJoinDomain2(struct torture_context *tctx, r.in.join_flags = WKSSVC_JOIN_FLAGS_JOIN_TYPE | WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE; - torture_comment(tctx, "testing NetrJoinDomain2 (assuming non-DC)\n"); + torture_comment(tctx, "Testing NetrJoinDomain2 (assuming non-DC)\n"); status = dcerpc_wkssvc_NetrJoinDomain2_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, @@ -1331,7 +1331,7 @@ static bool test_NetrUnjoinDomain2(struct torture_context *tctx, r.in.encrypted_password = pwd_buf; r.in.unjoin_flags = 0; - torture_comment(tctx, "testing NetrUnjoinDomain2 (assuming non-DC)\n"); + torture_comment(tctx, "Testing NetrUnjoinDomain2 (assuming non-DC)\n"); status = dcerpc_wkssvc_NetrUnjoinDomain2_r(b, tctx, &r); torture_assert_ntstatus_ok(tctx, status, diff --git a/source4/torture/smb2/acls.c b/source4/torture/smb2/acls.c index 8177a1ab2e8..45107083c49 100644 --- a/source4/torture/smb2/acls.c +++ b/source4/torture/smb2/acls.c @@ -397,7 +397,7 @@ static bool test_generic_bits(struct torture_context *tctx, struct smb2_tree *tr expected_mask_anon |= SEC_STD_DELETE; } - torture_comment(tctx, "testing generic bits 0x%08x\n", + torture_comment(tctx, "Testing generic bits 0x%08x\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, owner_sid, NULL, @@ -438,7 +438,7 @@ static bool test_generic_bits(struct torture_context *tctx, struct smb2_tree *tr continue; } - torture_comment(tctx, "testing generic bits 0x%08x (anonymous)\n", + torture_comment(tctx, "Testing generic bits 0x%08x (anonymous)\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, SID_NT_ANONYMOUS, NULL, @@ -554,7 +554,7 @@ static bool test_generic_bits(struct torture_context *tctx, struct smb2_tree *tr expected_mask_anon |= SEC_STD_DELETE; } - torture_comment(tctx, "testing generic bits 0x%08x\n", + torture_comment(tctx, "Testing generic bits 0x%08x\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, owner_sid, NULL, @@ -595,7 +595,7 @@ static bool test_generic_bits(struct torture_context *tctx, struct smb2_tree *tr continue; } - torture_comment(tctx, "testing generic bits 0x%08x (anonymous)\n", + torture_comment(tctx, "Testing generic bits 0x%08x (anonymous)\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, SID_NT_ANONYMOUS, NULL, @@ -1125,7 +1125,7 @@ static bool test_inheritance(struct torture_context *tctx, struct smb2_tree *tre } } - torture_comment(tctx, "testing access checks on inherited create with %s\n", fname1); + torture_comment(tctx, "Testing access checks on inherited create with %s\n", fname1); sd = security_descriptor_dacl_create(tctx, 0, NULL, NULL, owner_sid, diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c index c573f25172f..2e32ee03a0f 100644 --- a/source4/torture/smb2/create.c +++ b/source4/torture/smb2/create.c @@ -393,7 +393,7 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing alloc size\n"); + torture_comment(tctx, "Testing alloc size\n"); io.in.alloc_size = 4096; status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_OK); @@ -402,7 +402,7 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing durable open\n"); + torture_comment(tctx, "Testing durable open\n"); io.in.durable_open = true; status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_OK); @@ -410,7 +410,7 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing query maximal access\n"); + torture_comment(tctx, "Testing query maximal access\n"); io.in.query_maximal_access = true; status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_OK); @@ -419,13 +419,13 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing timewarp\n"); + torture_comment(tctx, "Testing timewarp\n"); io.in.timewarp = 10000; status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); io.in.timewarp = 0; - torture_comment(tctx, "testing query_on_disk\n"); + torture_comment(tctx, "Testing query_on_disk\n"); io.in.query_on_disk_id = true; status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_OK); @@ -433,7 +433,7 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing unknown tag\n"); + torture_comment(tctx, "Testing unknown tag\n"); status = smb2_create_blob_add(tctx, &io.in.blobs, "FooO", data_blob(NULL, 0)); CHECK_STATUS(status, NT_STATUS_OK); @@ -444,7 +444,7 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing bad tag length\n"); + torture_comment(tctx, "Testing bad tag length\n"); status = smb2_create_blob_add(tctx, &io.in.blobs, "xxx", data_blob(NULL, 0)); CHECK_STATUS(status, NT_STATUS_OK); @@ -1083,7 +1083,7 @@ static bool test_smb2_leading_slash(struct torture_context *tctx, static bool test_create_acl_file(struct torture_context *tctx, struct smb2_tree *tree) { - torture_comment(tctx, "testing nttrans create with sec_desc on files\n"); + torture_comment(tctx, "Testing nttrans create with sec_desc on files\n"); return test_create_acl_ext(tctx, tree, false); } @@ -1091,7 +1091,7 @@ static bool test_create_acl_file(struct torture_context *tctx, static bool test_create_acl_dir(struct torture_context *tctx, struct smb2_tree *tree) { - torture_comment(tctx, "testing nttrans create with sec_desc on directories\n"); + torture_comment(tctx, "Testing nttrans create with sec_desc on directories\n"); return test_create_acl_ext(tctx, tree, true); } diff --git a/source4/torture/smb2/dir.c b/source4/torture/smb2/dir.c index b1a85392a77..dbd1a19a45a 100644 --- a/source4/torture/smb2/dir.c +++ b/source4/torture/smb2/dir.c @@ -432,7 +432,7 @@ static bool test_one_file(struct torture_context *tctx, /* call all the File Information Classes */ for (i=0;i<ARRAY_SIZE(levels);i++) { - torture_comment(tctx, "testing %s %d\n", levels[i].name, + torture_comment(tctx, "Testing %s %d\n", levels[i].name, levels[i].level); levels[i].status = torture_single_file_search(tree, mem_ctx, diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c index d1fe5985b14..313ef6848f9 100644 --- a/source4/torture/smb2/notify.c +++ b/source4/torture/smb2/notify.c @@ -271,14 +271,14 @@ static bool torture_smb2_notify_dir(struct torture_context *torture, notify.smb2.in.file.handle = h1; notify.smb2.in.recursive = true; - torture_comment(torture, "testing notify cancel\n"); + torture_comment(torture, "Testing notify cancel\n"); req = smb2_notify_send(tree1, &(notify.smb2)); smb2_cancel(req); status = smb2_notify_recv(req, torture, &(notify.smb2)); CHECK_STATUS(status, NT_STATUS_CANCELLED); - torture_comment(torture, "testing notify mkdir\n"); + torture_comment(torture, "Testing notify mkdir\n"); req = smb2_notify_send(tree1, &(notify.smb2)); smb2_util_mkdir(tree2, fname); @@ -290,7 +290,7 @@ static bool torture_smb2_notify_dir(struct torture_context *torture, CHECK_VAL(notify.smb2.out.changes[0].action, NOTIFY_ACTION_ADDED); CHECK_WIRE_STR(notify.smb2.out.changes[0].name, "subdir-name"); - torture_comment(torture, "testing notify rmdir\n"); + torture_comment(torture, "Testing notify rmdir\n"); req = smb2_notify_send(tree1, &(notify.smb2)); smb2_util_rmdir(tree2, fname); @@ -302,7 +302,7 @@ static bool torture_smb2_notify_dir(struct torture_context *torture, CHECK_WIRE_STR(notify.smb2.out.changes[0].name, "subdir-name"); torture_comment(torture, - "testing notify mkdir - rmdir - mkdir - rmdir\n"); + "Testing notify mkdir - rmdir - mkdir - rmdir\n"); smb2_util_mkdir(tree2, fname); smb2_util_rmdir(tree2, fname); @@ -324,7 +324,7 @@ static bool torture_smb2_notify_dir(struct torture_context *torture, count = torture_numops; torture_comment(torture, - "testing buffered notify on create of %d files\n", count); + "Testing buffered notify on create of %d files\n", count); for (i=0;i<count;i++) { struct smb2_handle h12; char *fname2 = talloc_asprintf(torture, BASEDIR "\\test%d.txt", @@ -374,7 +374,7 @@ static bool torture_smb2_notify_dir(struct torture_context *torture, this unlink is only seen by the 1st notify and the 3rd notify (later) */ torture_comment(torture, - "testing notify on unlink for the first file\n"); + "Testing notify on unlink for the first file\n"); status = smb2_util_unlink(tree2, BASEDIR "\\test0.txt"); CHECK_STATUS(status, NT_STATUS_OK); @@ -441,7 +441,7 @@ static bool torture_smb2_notify_dir(struct torture_context *torture, } torture_comment(torture, - "testing if a close() on the dir handle triggers the notify reply\n"); + "Testing if a close() on the dir handle triggers the notify reply\n"); notify.smb2.in.file.handle = h1; req = smb2_notify_send(tree1, &(notify.smb2)); @@ -946,14 +946,14 @@ static bool torture_smb2_notify_mask(struct torture_context *torture, } while (0); \ } while (0); - torture_comment(torture, "testing mkdir\n"); - NOTIFY_MASK_TEST("testing mkdir",;, + torture_comment(torture, "Testing mkdir\n"); + NOTIFY_MASK_TEST("Testing mkdir",;, smb2_util_mkdir(tree2, BASEDIR "\\tname1");, smb2_util_rmdir(tree2, BASEDIR "\\tname1");, NOTIFY_ACTION_ADDED, FILE_NOTIFY_CHANGE_DIR_NAME, 1); - torture_comment(torture, "testing create file\n"); + torture_comment(torture, "Testing create file\n"); ZERO_STRUCT(io1.smb2); io1.generic.level = RAW_OPEN_SMB2; io1.smb2.in.create_flags = 0; @@ -967,15 +967,15 @@ static bool torture_smb2_notify_mask(struct torture_context *torture, io1.smb2.in.create_disposition = NTCREATEX_DISP_CREATE; io1.smb2.in.fname = BASEDIR "\\tname1"; - NOTIFY_MASK_TEST("testing create file",;, + NOTIFY_MASK_TEST("Testing create file",;, smb2_util_close(tree2, custom_smb2_create(tree2, torture, &(io1.smb2)));, smb2_util_unlink(tree2, BASEDIR "\\tname1");, NOTIFY_ACTION_ADDED, FILE_NOTIFY_CHANGE_FILE_NAME, 1); - torture_comment(torture, "testing unlink\n"); - NOTIFY_MASK_TEST("testing unlink", + torture_comment(torture, "Testing unlink\n"); + NOTIFY_MASK_TEST("Testing unlink", smb2_util_close(tree2, custom_smb2_create(tree2, torture, &(io1.smb2)));, smb2_util_unlink(tree2, BASEDIR "\\tname1");, @@ -983,22 +983,22 @@ static bool torture_smb2_notify_mask(struct torture_context *torture, NOTIFY_ACTION_REMOVED, FILE_NOTIFY_CHANGE_FILE_NAME, 1); - torture_comment(torture, "testing rmdir\n"); - NOTIFY_MASK_TEST("testing rmdir", + torture_comment(torture, "Testing rmdir\n"); + NOTIFY_MASK_TEST("Testing rmdir", smb2_util_mkdir(tree2, BASEDIR "\\tname1");, smb2_util_rmdir(tree2, BASEDIR "\\tname1");, ;, NOTIFY_ACTION_REMOVED, FILE_NOTIFY_CHANGE_DIR_NAME, 1); - torture_comment(torture, "testing rename file\n"); + torture_comment(torture, "Testing rename file\n"); ZERO_STRUCT(sinfo); sinfo.rename_information.level = RAW_SFILEINFO_RENAME_INFORMATION; sinfo.rename_information.in.file.handle = h1; sinfo.rename_information.in.overwrite = true; sinfo.rename_information.in.root_fid = 0; sinfo.rename_information.in.new_name = BASEDIR "\\tname2"; - NOTIFY_MASK_TEST("testing rename file", + NOTIFY_MASK_TEST("Testing rename file", smb2_util_close(tree2, custom_smb2_create(tree2, torture, &(io1.smb2)));, smb2_setinfo_file(tree2, &sinfo);, @@ -1006,22 +1006,22 @@ static bool torture_smb2_notify_mask(struct torture_context *torture, NOTIFY_ACTION_OLD_NAME, FILE_NOTIFY_CHANGE_FILE_NAME, 2); - torture_comment(torture, "testing rename dir\n"); + torture_comment(torture, "Testing rename dir\n"); ZERO_STRUCT(sinfo); sinfo.rename_information.level = RAW_SFILEINFO_RENAME_INFORMATION; sinfo.rename_information.in.file.handle = h1; sinfo.rename_information.in.overwrite = true; sinfo.rename_information.in.root_fid = 0; sinfo.rename_information.in.new_name = BASEDIR "\\tname2"; - NOTIFY_MASK_TEST("testing rename dir", + NOTIFY_MASK_TEST("Testing rename dir", smb2_util_mkdir(tree2, BASEDIR "\\tname1");, smb2_setinfo_file(tree2, &sinfo);, smb2_util_rmdir(tree2, BASEDIR "\\tname2");, NOTIFY_ACTION_OLD_NAME, FILE_NOTIFY_CHANGE_DIR_NAME, 2); - torture_comment(torture, "testing set path attribute\n"); - NOTIFY_MASK_TEST("testing set path attribute", + torture_comment(torture, "Testing set path attribute\n"); + NOTIFY_MASK_TEST("Testing set path attribute", smb2_util_close(tree2, custom_smb2_create(tree2, torture, &(io.smb2)));, smb2_util_setatr(tree2, BASEDIR "\\tname1", @@ -1030,12 +1030,12 @@ static bool torture_smb2_notify_mask(struct torture_context *torture, NOTIFY_ACTION_MODIFIED, FILE_NOTIFY_CHANGE_ATTRIBUTES, 1); - torture_comment(torture, "testing set path write time\n"); + torture_comment(torture, "Testing set path write time\n"); ZERO_STRUCT(sinfo); sinfo.generic.level = RAW_SFILEINFO_BASIC_INFORMATION; sinfo.generic.in.file.handle = h1; sinfo.basic_info.in.write_time = 1000; - NOTIFY_MASK_TEST("testing set path write time", + NOTIFY_MASK_TEST("Testing set path write time", smb2_util_close(tree2, custom_smb2_create(tree2, torture, &(io1.smb2)));, smb2_setinfo_file(tree2, &sinfo);, @@ -1053,8 +1053,8 @@ static bool torture_smb2_notify_mask(struct torture_context *torture, sinfo.generic.level = RAW_SFILEINFO_BASIC_INFORMATION; sinfo.generic.in.file.handle = h1; sinfo.basic_info.in.create_time = 0; - torture_comment(torture, "testing set file create time\n"); - NOTIFY_MASK_TEST("testing set file create time", + torture_comment(torture, "Testing set file create time\n"); + NOTIFY_MASK_TEST("Testing set file create time", smb2_create_complex_file(tree2, BASEDIR "\\tname1", &h2);, smb2_setinfo_file(tree2, &sinfo);, @@ -1068,8 +1068,8 @@ static bool torture_smb2_notify_mask(struct torture_context *torture, sinfo.generic.level = RAW_SFILEINFO_BASIC_INFORMATION; sinfo.generic.in.file.handle = h1; sinfo.basic_info.in.access_time = 0; - torture_comment(torture, "testing set file access time\n"); - NOTIFY_MASK_TEST("testing set file access time", + torture_comment(torture, "Testing set file access time\n"); + NOTIFY_MASK_TEST("Testing set file access time", smb2_create_complex_file(tree2, BASEDIR "\\tname1", &h2);, smb2_setinfo_file(tree2, &sinfo);, (smb2_util_close(tree2, h2), @@ -1081,8 +1081,8 @@ static bool torture_smb2_notify_mask(struct torture_context *torture, sinfo.generic.level = RAW_SFILEINFO_BASIC_INFORMATION; sinfo.generic.in.file.handle = h1; sinfo.basic_info.in.change_time = 0; - torture_comment(torture, "testing set file change time\n"); - NOTIFY_MASK_TEST("testing set file change time", + torture_comment(torture, "Testing set file change time\n"); + NOTIFY_MASK_TEST("Testing set file change time", smb2_create_complex_file(tree2, BASEDIR "\\tname1", &h2);, smb2_setinfo_file(tree2, &sinfo);, (smb2_util_close(tree2, h2), @@ -1091,8 +1091,8 @@ static bool torture_smb2_notify_mask(struct torture_context *torture, 0, 1); - torture_comment(torture, "testing write\n"); - NOTIFY_MASK_TEST("testing write", + torture_comment(torture, "Testing write\n"); + NOTIFY_MASK_TEST("Testing write", smb2_create_complex_file(tree2, BASEDIR "\\tname1", &h2);, smb2_util_write(tree2, h2, &c, 10000, 1);, (smb2_util_close(tree2, h2), @@ -1154,7 +1154,7 @@ static bool torture_smb2_notify_file(struct torture_context *torture, notify.smb2.in.recursive = false; torture_comment(torture, - "testing if notifies on file handles are invalid (should be)\n"); + "Testing if notifies on file handles are invalid (should be)\n"); req = smb2_notify_send(tree, &(notify.smb2)); status = smb2_notify_recv(req, torture, &(notify.smb2)); @@ -1677,7 +1677,7 @@ static bool torture_smb2_notify_overflow(struct torture_context *torture, /* open a lot of files, filling up the server side notify buffer */ torture_comment(torture, - "testing overflowed buffer notify on create of %d files\n", + "Testing overflowed buffer notify on create of %d files\n", count); for (i=0;i<count;i++) { @@ -1878,7 +1878,7 @@ static bool torture_smb2_notify_tcon(struct torture_context *torture, notify.smb2.in.file.handle = h1; notify.smb2.in.recursive = true; - torture_comment(torture, "testing notify mkdir\n"); + torture_comment(torture, "Testing notify mkdir\n"); req = smb2_notify_send(tree, &(notify.smb2)); smb2_cancel(req); status = smb2_notify_recv(req, torture, &(notify.smb2)); @@ -1896,7 +1896,7 @@ static bool torture_smb2_notify_tcon(struct torture_context *torture, CHECK_VAL(notify.smb2.out.changes[0].action, NOTIFY_ACTION_ADDED); CHECK_WIRE_STR(notify.smb2.out.changes[0].name, "subdir-name"); - torture_comment(torture, "testing notify rmdir\n"); + torture_comment(torture, "Testing notify rmdir\n"); req = smb2_notify_send(tree, &(notify.smb2)); status = smb2_util_rmdir(tree, fname); CHECK_STATUS(status, NT_STATUS_OK); @@ -1912,7 +1912,7 @@ static bool torture_smb2_notify_tcon(struct torture_context *torture, torture_comment(torture, "TESTING WITH SECONDARY TCON\n"); tree1 = secondary_tcon(tree, torture); - torture_comment(torture, "testing notify mkdir\n"); + torture_comment(torture, "Testing notify mkdir\n"); req = smb2_notify_send(tree, &(notify.smb2)); smb2_util_mkdir(tree1, fname); @@ -1923,7 +1923,7 @@ static bool torture_smb2_notify_tcon(struct torture_context *torture, CHECK_VAL(notify.smb2.out.changes[0].action, NOTIFY_ACTION_ADDED); CHECK_WIRE_STR(notify.smb2.out.changes[0].name, "subdir-name"); - torture_comment(torture, "testing notify rmdir\n"); + torture_comment(torture, "Testing notify rmdir\n"); req = smb2_notify_send(tree, &(notify.smb2)); smb2_util_rmdir(tree, fname); @@ -1940,7 +1940,7 @@ static bool torture_smb2_notify_tcon(struct torture_context *torture, CHECK_STATUS(status, NT_STATUS_OK); talloc_free(tree1); - torture_comment(torture, "testing notify mkdir\n"); + torture_comment(torture, "Testing notify mkdir\n"); req = smb2_notify_send(tree, &(notify.smb2)); smb2_util_mkdir(tree, fname); @@ -1951,7 +1951,7 @@ static bool torture_smb2_notify_tcon(struct torture_context *torture, CHECK_VAL(notify.smb2.out.changes[0].action, NOTIFY_ACTION_ADDED); CHECK_WIRE_STR(notify.smb2.out.changes[0].name, "subdir-name"); - torture_comment(torture, "testing notify rmdir\n"); + torture_comment(torture, "Testing notify rmdir\n"); req = smb2_notify_send(tree, &(notify.smb2)); smb2_util_rmdir(tree, fname); |