subunit: Remove more test output that could be interpreted by subunit.

2 files changed, 49 insertions, 49 deletions

diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index d883a79498..309a394476 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -950,13 +950,13 @@ error_test4:
 	smbcli_setatr(cli2->tree, fname, 0, 0);
 	smbcli_unlink(cli2->tree, fname);
 	
-	torture_comment(tctx, "TEST #1 testing 2 non-io opens (no delete)\n");
+	torture_comment(tctx, "Test #1 testing 2 non-io opens (no delete)\n");
 	
 	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		torture_comment(tctx, "test 1 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 1 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test10);
 		return false;
 	}
@@ -964,17 +964,17 @@ error_test4:
 	fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 	if (fnum2 == -1) {
-		torture_comment(tctx, "test 1 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 1 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test10);
 		return false;
 	}
 
 	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		torture_comment(tctx, "test 1 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 1 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		return false;
 	}
 	if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) {
-		torture_comment(tctx, "test 1 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 1 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		return false;
 	}
 
@@ -982,13 +982,13 @@ error_test4:
 error_test10:
 	smbcli_unlink(cli1->tree, fname);
 
-	torture_comment(tctx, "TEST #2 testing 2 non-io opens (first with delete)\n");
+	torture_comment(tctx, "Test #2 testing 2 non-io opens (first with delete)\n");
 	
 	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		torture_comment(tctx, "test 2 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 2 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test20);
 		return false;
 	}
@@ -997,17 +997,17 @@ error_test10:
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 == -1) {
-		torture_comment(tctx, "test 2 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 2 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test20);
 		return false;
 	}
 
 	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		torture_comment(tctx, "test 1 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 1 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		return false;
 	}
 	if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) {
-		torture_comment(tctx, "test 1 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 1 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		return false;
 	}
 
@@ -1015,13 +1015,13 @@ error_test10:
 error_test20:
 	smbcli_unlink(cli1->tree, fname);
 
-	torture_comment(tctx, "TEST #3 testing 2 non-io opens (second with delete)\n");
+	torture_comment(tctx, "Test #3 testing 2 non-io opens (second with delete)\n");
 	
 	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		torture_comment(tctx, "test 3 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 3 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test30);
 		return false;
 	}
@@ -1030,17 +1030,17 @@ error_test20:
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 == -1) {
-		torture_comment(tctx, "test 3 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 3 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test30);
 		return false;
 	}
 
 	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		torture_comment(tctx, "test 3 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 3 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		return false;
 	}
 	if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) {
-		torture_comment(tctx, "test 3 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 3 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		return false;
 	}
 
@@ -1048,13 +1048,13 @@ error_test20:
 error_test30:
 	smbcli_unlink(cli1->tree, fname);
 
-	torture_comment(tctx, "TEST #4 testing 2 non-io opens (both with delete)\n");
+	torture_comment(tctx, "Test #4 testing 2 non-io opens (both with delete)\n");
 	
 	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		torture_comment(tctx, "test 4 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 4 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test40);
 		return false;
 	}
@@ -1063,15 +1063,15 @@ error_test30:
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 != -1) {
-		torture_comment(tctx, "test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test40);
 		return false;
 	}
 
-	torture_comment(tctx, "test 4 open 2 of %s gave %s (correct error should be %s)\n", fname, smbcli_errstr(cli2->tree), "sharing violation");
+	torture_comment(tctx, "Test 4 open 2 of %s gave %s (correct error should be %s)\n", fname, smbcli_errstr(cli2->tree), "sharing violation");
 
 	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		torture_comment(tctx, "test 4 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 4 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		return false;
 	}
 
@@ -1079,13 +1079,13 @@ error_test30:
 error_test40:
 	smbcli_unlink(cli1->tree, fname);
 
-	torture_comment(tctx, "TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n");
+	torture_comment(tctx, "Test #5 testing 2 non-io opens (both with delete - both with file share delete)\n");
 	
 	fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		torture_comment(tctx, "test 5 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 5 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test50);
 		return false;
 	}
@@ -1094,24 +1094,24 @@ error_test40:
 				   NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 == -1) {
-		torture_comment(tctx, "test 5 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 5 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test50);
 		return false;
 	}
 
 	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		torture_comment(tctx, "test 5 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 5 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		return false;
 	}
 
 	if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) {
-		torture_comment(tctx, "test 5 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 5 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		return false;
 	}
 
 	torture_comment(tctx, "non-io open test #5 passed.\n");
 error_test50:
-	torture_comment(tctx, "TEST #6 testing 1 non-io open, one io open\n");
+	torture_comment(tctx, "Test #6 testing 1 non-io open, one io open\n");
 	
 	smbcli_unlink(cli1->tree, fname);
 
@@ -1119,7 +1119,7 @@ error_test50:
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		torture_comment(tctx, "test 6 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 6 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test60);
 		return false;
 	}
@@ -1128,24 +1128,24 @@ error_test50:
 				   NTCREATEX_SHARE_ACCESS_READ, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 == -1) {
-		torture_comment(tctx, "test 6 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 6 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test60);
 		return false;
 	}
 
 	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		torture_comment(tctx, "test 6 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 6 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		return false;
 	}
 
 	if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) {
-		torture_comment(tctx, "test 6 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 6 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		return false;
 	}
 
 	torture_comment(tctx, "non-io open test #6 passed.\n");
 error_test60:
-	torture_comment(tctx, "TEST #7 testing 1 non-io open, one io open with delete\n");
+	torture_comment(tctx, "Test #7 testing 1 non-io open, one io open with delete\n");
 
 	smbcli_unlink(cli1->tree, fname);
 
@@ -1153,7 +1153,7 @@ error_test60:
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		torture_comment(tctx, "test 7 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 7 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test70);
 		return false;
 	}
@@ -1162,15 +1162,15 @@ error_test60:
 				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 != -1) {
-		torture_comment(tctx, "test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, smbcli_errstr(cli2->tree));
+		torture_comment(tctx, "Test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, smbcli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test70);
 		return false;
 	}
 
-	torture_comment(tctx, "test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, smbcli_errstr(cli2->tree), "sharing violation");
+	torture_comment(tctx, "Test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, smbcli_errstr(cli2->tree), "sharing violation");
 
 	if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
-		torture_comment(tctx, "test 7 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
+		torture_comment(tctx, "Test 7 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
 		return false;
 	}
 
@@ -1178,7 +1178,7 @@ error_test60:
 
 error_test70:
 
-	torture_comment(tctx, "TEST #8 testing one normal open, followed by lock, followed by open with truncate\n");
+	torture_comment(tctx, "Test #8 testing one normal open, followed by lock, followed by open with truncate\n");
 
 	smbcli_unlink(cli1->tree, fname);
 
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 5d7cb05b79..3b6de674ec 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -182,7 +182,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	}} while (0)
 
 	
-	printf("test setattr\n");
+	printf("Test setattr\n");
 	sfinfo.setattr.in.attrib = FILE_ATTRIBUTE_READONLY;
 	sfinfo.setattr.in.write_time = basetime;
 	CHECK_CALL_PATH(SETATTR, NT_STATUS_OK);
@@ -203,7 +203,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	CHECK_VALUE(ALL_INFO, all_info, attrib,     FILE_ATTRIBUTE_NORMAL);
 	CHECK_TIME (ALL_INFO, all_info, write_time, basetime);
 
-	printf("test setattre\n");
+	printf("Test setattre\n");
 	sfinfo.setattre.in.create_time = basetime + 20;
 	sfinfo.setattre.in.access_time = basetime + 30;
 	sfinfo.setattre.in.write_time  = basetime + 40;
@@ -220,7 +220,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	CHECK_TIME(ALL_INFO, all_info, access_time, basetime + 30);
 	CHECK_TIME(ALL_INFO, all_info, write_time,  basetime + 40);
 
-	printf("test standard level\n");
+	printf("Test standard level\n");
 	sfinfo.standard.in.create_time = basetime + 100;
 	sfinfo.standard.in.access_time = basetime + 200;
 	sfinfo.standard.in.write_time  = basetime + 300;
@@ -229,7 +229,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	CHECK_TIME(ALL_INFO, all_info, access_time, basetime + 200);
 	CHECK_TIME(ALL_INFO, all_info, write_time,  basetime + 300);
 
-	printf("test basic_info level\n");
+	printf("Test basic_info level\n");
 	basetime += 86400;
 	unix_to_nt_time(&sfinfo.basic_info.in.create_time, basetime + 100);
 	unix_to_nt_time(&sfinfo.basic_info.in.access_time, basetime + 200);
@@ -256,7 +256,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	CHECK_TIME(ALL_INFO, all_info, change_time, basetime + 400);
 	CHECK_VALUE(ALL_INFO, all_info, attrib,     FILE_ATTRIBUTE_READONLY);
 
-	printf("test basic_information level\n");
+	printf("Test basic_information level\n");
 	basetime += 86400;
 	unix_to_nt_time(&sfinfo.basic_info.in.create_time, basetime + 100);
 	unix_to_nt_time(&sfinfo.basic_info.in.access_time, basetime + 200);
@@ -301,7 +301,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	*/
 	CHECK_VALUE(ALL_INFO, all_info, attrib,     FILE_ATTRIBUTE_NORMAL);
 
-	printf("test disposition_info level\n");
+	printf("Test disposition_info level\n");
 	sfinfo.disposition_info.in.delete_on_close = 1;
 	CHECK_CALL_FNUM(DISPOSITION_INFO, NT_STATUS_OK);
 	CHECK_VALUE(ALL_INFO, all_info, delete_pending, 1);
@@ -312,7 +312,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	CHECK_VALUE(ALL_INFO, all_info, delete_pending, 0);
 	CHECK_VALUE(ALL_INFO, all_info, nlink, 1);
 
-	printf("test disposition_information level\n");
+	printf("Test disposition_information level\n");
 	sfinfo.disposition_info.in.delete_on_close = 1;
 	CHECK_CALL_FNUM(DISPOSITION_INFORMATION, NT_STATUS_OK);
 	CHECK_VALUE(ALL_INFO, all_info, delete_pending, 1);
@@ -334,7 +334,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	CHECK_VALUE(ALL_INFO, all_info, delete_pending, 0);
 	CHECK_VALUE(ALL_INFO, all_info, nlink, 1);
 
-	printf("test allocation_info level\n");
+	printf("Test allocation_info level\n");
 	sfinfo.allocation_info.in.alloc_size = 0;
 	CHECK_CALL_FNUM(ALLOCATION_INFO, NT_STATUS_OK);
 	CHECK_VALUE(ALL_INFO, all_info, size, 0);
@@ -366,7 +366,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	CHECK_VALUE(ALL_INFO, all_info, alloc_size, 0);
 	CHECK_VALUE(ALL_INFO, all_info, size, 0);
 
-	printf("test end_of_file_info level\n");
+	printf("Test end_of_file_info level\n");
 	sfinfo.end_of_file_info.in.size = 37;
 	CHECK_CALL_FNUM(END_OF_FILE_INFO, NT_STATUS_OK);
 	CHECK_VALUE(ALL_INFO, all_info, size, 37);
@@ -389,7 +389,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	CHECK_CALL_PATH(END_OF_FILE_INFORMATION, NT_STATUS_OK);
 	CHECK_VALUE(ALL_INFO, all_info, size, 7);
 
-	printf("test position_information level\n");
+	printf("Test position_information level\n");
 	sfinfo.position_information.in.position = 123456;
 	CHECK_CALL_FNUM(POSITION_INFORMATION, NT_STATUS_OK);
 	CHECK_VALUE(POSITION_INFORMATION, position_information, position, 123456);
@@ -397,7 +397,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	CHECK_CALL_PATH(POSITION_INFORMATION, NT_STATUS_OK);
 	CHECK_VALUE(POSITION_INFORMATION, position_information, position, 0);
 
-	printf("test mode_information level\n");
+	printf("Test mode_information level\n");
 	sfinfo.mode_information.in.mode = 2;
 	CHECK_CALL_FNUM(MODE_INFORMATION, NT_STATUS_OK);
 	CHECK_VALUE(MODE_INFORMATION, mode_information, mode, 2);
@@ -417,11 +417,11 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state
 	CHECK_VALUE(MODE_INFORMATION, mode_information, mode, 0);
 
 #if 0
-	printf("test unix_basic level\n");
+	printf("Test unix_basic level\n");
 	CHECK_CALL_FNUM(UNIX_BASIC, NT_STATUS_OK);
 	CHECK_CALL_PATH(UNIX_BASIC, NT_STATUS_OK);
 
-	printf("test unix_link level\n");
+	printf("Test unix_link level\n");
 	CHECK_CALL_FNUM(UNIX_LINK, NT_STATUS_OK);
 	CHECK_CALL_PATH(UNIX_LINK, NT_STATUS_OK);
 #endif