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.

1 files changed, 46 insertions, 46 deletions

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, &notify);
 	smb_raw_ntcancel(req);
 	status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
 	CHECK_STATUS(status, NT_STATUS_CANCELLED);
 
-	printf("testing notify mkdir\n");
+	printf("Testing notify mkdir\n");
 
 	req = smb_raw_changenotify_send(cli->tree, &notify);
 	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, &notify);
 	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, &notify);
@@ -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, &notify);
 	status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
@@ -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, &notify);
 	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, &notify);
 	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, &notify);
 	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, &notify);
 	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, &notify);
 	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, &notify);
 	smbcli_rmdir(cli->tree, BASEDIR "\\subdir-name");