From 7da94cc4a664521be279b019e9f32121cd410193 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 11 Apr 2010 01:39:06 +0200 Subject: subunit: Support formatting compatible with upstream subunit, for consistency. Upstream subunit makes a ":" after commands optional, so I've fixed any places where we might trigger commands accidently. I've filed a bug about this in subunit. --- source4/torture/raw/acls.c | 14 +++--- source4/torture/raw/chkpath.c | 10 ++--- source4/torture/raw/close.c | 8 ++-- source4/torture/raw/composite.c | 13 +++--- source4/torture/raw/lock.c | 26 ++++++------ source4/torture/raw/lookuprate.c | 2 +- source4/torture/raw/mkdir.c | 14 +++--- source4/torture/raw/mux.c | 4 +- source4/torture/raw/notify.c | 92 ++++++++++++++++++++-------------------- source4/torture/raw/search.c | 2 +- 10 files changed, 93 insertions(+), 92 deletions(-) (limited to 'source4/torture/raw') diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c index 82eaba459d..1d4bee1486 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 433525b7cc..aaf4446b8e 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 01175836df..e1b2b7db61 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 49564dc1ad..73a25fd345 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 6c86a6f615..02076dfbb8 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 13605f5b71..96ae92f1e8 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 c109ee7cf7..9c744b2db8 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 b0764ff69c..e8418f892c 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 257cf9daf6..5bf7f4aa3b 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;itree, 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;itree, ¬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 493039a307..3951605834 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, -- cgit