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.

2 files changed, 18 insertions, 18 deletions

diff --git a/source4/torture/libnetapi/libnetapi_group.c b/source4/torture/libnetapi/libnetapi_group.c
index e8e5ad931a..6f1428dbcf 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 2731cbd772..2afc1e5916 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) {