s4-smbtorture: Make test names lowercase and dot-separated.

This is consistent with the test names used by selftest, should
make the names less confusing and easier to integrate with other tools.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Dec 11 04:16:13 CET 2010 on sn-devel-104

12 files changed, 133 insertions, 138 deletions

diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 1d4bee1486..c1d41c6f10 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -2438,19 +2438,19 @@ done:
 */
 struct torture_suite *torture_raw_acls(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "ACLS");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "acls");
 
-	torture_suite_add_1smb_test(suite, "SD", test_sd);
-	torture_suite_add_1smb_test(suite, "CREATE_FILE", test_nttrans_create_file);
-	torture_suite_add_1smb_test(suite, "CREATE_DIR", test_nttrans_create_dir);
-	torture_suite_add_1smb_test(suite, "NULLDACL", test_nttrans_create_null_dacl);
-	torture_suite_add_1smb_test(suite, "CREATOR", test_creator_sid);
-	torture_suite_add_1smb_test(suite, "GENERIC", test_generic_bits);
-	torture_suite_add_1smb_test(suite, "OWNER", test_owner_bits);
-	torture_suite_add_1smb_test(suite, "INHERITANCE", test_inheritance);
+	torture_suite_add_1smb_test(suite, "sd", test_sd);
+	torture_suite_add_1smb_test(suite, "create_file", test_nttrans_create_file);
+	torture_suite_add_1smb_test(suite, "create_dir", test_nttrans_create_dir);
+	torture_suite_add_1smb_test(suite, "nulldacl", test_nttrans_create_null_dacl);
+	torture_suite_add_1smb_test(suite, "creator", test_creator_sid);
+	torture_suite_add_1smb_test(suite, "generic", test_generic_bits);
+	torture_suite_add_1smb_test(suite, "owner", test_owner_bits);
+	torture_suite_add_1smb_test(suite, "inheritance", test_inheritance);
 
 	/* torture_suite_add_1smb_test(suite, "INHERITFLAGS", test_inheritance_flags); */
-	torture_suite_add_1smb_test(suite, "DYNAMIC", test_inheritance_dynamic);
+	torture_suite_add_1smb_test(suite, "dynamic", test_inheritance_dynamic);
 	/* XXX This test does not work against XP or Vista.
 	torture_suite_add_1smb_test(suite, "GETSET", test_sd_get_set);
 	*/
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index 17757e4116..df44dd3fa2 100644
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -2273,7 +2273,7 @@ done:
 */
 struct torture_suite *torture_raw_lock(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCK");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "lock");
 
 	torture_suite_add_1smb_test(suite, "lockx", test_lockx);
 	torture_suite_add_1smb_test(suite, "lock", test_lock);
@@ -2286,10 +2286,8 @@ struct torture_suite *torture_raw_lock(TALLOC_CTX *mem_ctx)
 	torture_suite_add_1smb_test(suite, "unlock", test_unlock);
 	torture_suite_add_1smb_test(suite, "multiple_unlock",
 	    test_multiple_unlock);
-	torture_suite_add_1smb_test(suite, "zerobytelocks",
-	    test_zerobytelocks);
-	torture_suite_add_1smb_test(suite, "zerobyteread",
-	    test_zerobyteread);
+	torture_suite_add_1smb_test(suite, "zerobytelocks", test_zerobytelocks);
+	torture_suite_add_1smb_test(suite, "zerobyteread", test_zerobyteread);
 
 	return suite;
 }
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index c8494ab22b..5661c2f6f6 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -2069,25 +2069,25 @@ static bool test_ntcreatexdir(struct torture_context *tctx,
 */
 struct torture_suite *torture_raw_open(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "OPEN");
-
-	torture_suite_add_1smb_test(suite, "BRLOCKED", test_ntcreatex_brlocked);
-	torture_suite_add_1smb_test(suite, "OPEN", test_open);
-	torture_suite_add_1smb_test(suite, "OPEN-MULTI", test_raw_open_multi);
-	torture_suite_add_1smb_test(suite, "OPENX", test_openx);
-	torture_suite_add_1smb_test(suite, "NTCREATEX", test_ntcreatex);
-	torture_suite_add_1smb_test(suite, "NTTRANS-CREATE", test_nttrans_create);
-	torture_suite_add_1smb_test(suite, "T2OPEN", test_t2open);
-	torture_suite_add_1smb_test(suite, "MKNEW", test_mknew);
-	torture_suite_add_1smb_test(suite, "CREATE", test_create);
-	torture_suite_add_1smb_test(suite, "CTEMP", test_ctemp);
-	torture_suite_add_1smb_test(suite, "CHAINED-OPENX", test_chained);
-	torture_suite_add_1smb_test(suite, "CHAINED-NTCREATEX", test_chained_ntcreatex_readx);
-	torture_suite_add_1smb_test(suite, "NO-LEADING-SLASH", test_no_leading_slash);
-	torture_suite_add_1smb_test(suite, "OPENX-OVER-DIR", test_openx_over_dir);
-	torture_suite_add_1smb_test(suite, "OPEN-FOR-DELETE", test_open_for_delete);
-	torture_suite_add_1smb_test(suite, "OPENDISP-DIR", test_ntcreatex_opendisp_dir);
-	torture_suite_add_1smb_test(suite, "NTCREATEDIR", test_ntcreatexdir);
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "open");
+
+	torture_suite_add_1smb_test(suite, "brlocked", test_ntcreatex_brlocked);
+	torture_suite_add_1smb_test(suite, "open", test_open);
+	torture_suite_add_1smb_test(suite, "open-multi", test_raw_open_multi);
+	torture_suite_add_1smb_test(suite, "openx", test_openx);
+	torture_suite_add_1smb_test(suite, "ntcreatex", test_ntcreatex);
+	torture_suite_add_1smb_test(suite, "nttrans-create", test_nttrans_create);
+	torture_suite_add_1smb_test(suite, "t2open", test_t2open);
+	torture_suite_add_1smb_test(suite, "mknew", test_mknew);
+	torture_suite_add_1smb_test(suite, "create", test_create);
+	torture_suite_add_1smb_test(suite, "ctemp", test_ctemp);
+	torture_suite_add_1smb_test(suite, "chained-openx", test_chained);
+	torture_suite_add_1smb_test(suite, "chained-ntcreatex", test_chained_ntcreatex_readx);
+	torture_suite_add_1smb_test(suite, "no-leading-slash", test_no_leading_slash);
+	torture_suite_add_1smb_test(suite, "openx-over-dir", test_openx_over_dir);
+	torture_suite_add_1smb_test(suite, "open-for-delete", test_open_for_delete);
+	torture_suite_add_1smb_test(suite, "opendisp-dir", test_ntcreatex_opendisp_dir);
+	torture_suite_add_1smb_test(suite, "ntcreatedir", test_ntcreatexdir);
 
 	return suite;
 }
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 835a1b27b6..962235cdcd 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -3860,46 +3860,46 @@ done:
 */
 struct torture_suite *torture_raw_oplock(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "OPLOCK");
-
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE1", test_raw_oplock_exclusive1);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE2", test_raw_oplock_exclusive2);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE3", test_raw_oplock_exclusive3);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE4", test_raw_oplock_exclusive4);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE5", test_raw_oplock_exclusive5);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE6", test_raw_oplock_exclusive6);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE7", test_raw_oplock_exclusive7);
-	torture_suite_add_2smb_test(suite, "BATCH1", test_raw_oplock_batch1);
-	torture_suite_add_2smb_test(suite, "BATCH2", test_raw_oplock_batch2);
-	torture_suite_add_2smb_test(suite, "BATCH3", test_raw_oplock_batch3);
-	torture_suite_add_2smb_test(suite, "BATCH4", test_raw_oplock_batch4);
-	torture_suite_add_2smb_test(suite, "BATCH5", test_raw_oplock_batch5);
-	torture_suite_add_2smb_test(suite, "BATCH6", test_raw_oplock_batch6);
-	torture_suite_add_2smb_test(suite, "BATCH7", test_raw_oplock_batch7);
-	torture_suite_add_2smb_test(suite, "BATCH8", test_raw_oplock_batch8);
-	torture_suite_add_2smb_test(suite, "BATCH9", test_raw_oplock_batch9);
-	torture_suite_add_2smb_test(suite, "BATCH10", test_raw_oplock_batch10);
-	torture_suite_add_2smb_test(suite, "BATCH11", test_raw_oplock_batch11);
-	torture_suite_add_2smb_test(suite, "BATCH12", test_raw_oplock_batch12);
-	torture_suite_add_2smb_test(suite, "BATCH13", test_raw_oplock_batch13);
-	torture_suite_add_2smb_test(suite, "BATCH14", test_raw_oplock_batch14);
-	torture_suite_add_2smb_test(suite, "BATCH15", test_raw_oplock_batch15);
-	torture_suite_add_2smb_test(suite, "BATCH16", test_raw_oplock_batch16);
-	torture_suite_add_2smb_test(suite, "BATCH17", test_raw_oplock_batch17);
-	torture_suite_add_2smb_test(suite, "BATCH18", test_raw_oplock_batch18);
-	torture_suite_add_2smb_test(suite, "BATCH19", test_raw_oplock_batch19);
-	torture_suite_add_2smb_test(suite, "BATCH20", test_raw_oplock_batch20);
-	torture_suite_add_2smb_test(suite, "BATCH21", test_raw_oplock_batch21);
-	torture_suite_add_2smb_test(suite, "BATCH22", test_raw_oplock_batch22);
-	torture_suite_add_2smb_test(suite, "BATCH23", test_raw_oplock_batch23);
-	torture_suite_add_2smb_test(suite, "BATCH24", test_raw_oplock_batch24);
-	torture_suite_add_2smb_test(suite, "BATCH25", test_raw_oplock_batch25);
-	torture_suite_add_2smb_test(suite, "BATCH26", test_raw_oplock_batch26);
-	torture_suite_add_2smb_test(suite, "STREAM1", test_raw_oplock_stream1);
-	torture_suite_add_1smb_test(suite, "DOC1", test_raw_oplock_doc);
-	torture_suite_add_2smb_test(suite, "BRL1", test_raw_oplock_brl1);
-	torture_suite_add_1smb_test(suite, "BRL2", test_raw_oplock_brl2);
-	torture_suite_add_1smb_test(suite, "BRL3", test_raw_oplock_brl3);
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "oplock");
+
+	torture_suite_add_2smb_test(suite, "exclusive1", test_raw_oplock_exclusive1);
+	torture_suite_add_2smb_test(suite, "exclusive2", test_raw_oplock_exclusive2);
+	torture_suite_add_2smb_test(suite, "exclusive3", test_raw_oplock_exclusive3);
+	torture_suite_add_2smb_test(suite, "exclusive4", test_raw_oplock_exclusive4);
+	torture_suite_add_2smb_test(suite, "exclusive5", test_raw_oplock_exclusive5);
+	torture_suite_add_2smb_test(suite, "exclusive6", test_raw_oplock_exclusive6);
+	torture_suite_add_2smb_test(suite, "exclusive7", test_raw_oplock_exclusive7);
+	torture_suite_add_2smb_test(suite, "batch1", test_raw_oplock_batch1);
+	torture_suite_add_2smb_test(suite, "batch2", test_raw_oplock_batch2);
+	torture_suite_add_2smb_test(suite, "batch3", test_raw_oplock_batch3);
+	torture_suite_add_2smb_test(suite, "batch4", test_raw_oplock_batch4);
+	torture_suite_add_2smb_test(suite, "batch5", test_raw_oplock_batch5);
+	torture_suite_add_2smb_test(suite, "batch6", test_raw_oplock_batch6);
+	torture_suite_add_2smb_test(suite, "batch7", test_raw_oplock_batch7);
+	torture_suite_add_2smb_test(suite, "batch8", test_raw_oplock_batch8);
+	torture_suite_add_2smb_test(suite, "batch9", test_raw_oplock_batch9);
+	torture_suite_add_2smb_test(suite, "batch10", test_raw_oplock_batch10);
+	torture_suite_add_2smb_test(suite, "batch11", test_raw_oplock_batch11);
+	torture_suite_add_2smb_test(suite, "batch12", test_raw_oplock_batch12);
+	torture_suite_add_2smb_test(suite, "batch13", test_raw_oplock_batch13);
+	torture_suite_add_2smb_test(suite, "batch14", test_raw_oplock_batch14);
+	torture_suite_add_2smb_test(suite, "batch15", test_raw_oplock_batch15);
+	torture_suite_add_2smb_test(suite, "batch16", test_raw_oplock_batch16);
+	torture_suite_add_2smb_test(suite, "batch17", test_raw_oplock_batch17);
+	torture_suite_add_2smb_test(suite, "batch18", test_raw_oplock_batch18);
+	torture_suite_add_2smb_test(suite, "batch19", test_raw_oplock_batch19);
+	torture_suite_add_2smb_test(suite, "batch20", test_raw_oplock_batch20);
+	torture_suite_add_2smb_test(suite, "batch21", test_raw_oplock_batch21);
+	torture_suite_add_2smb_test(suite, "batch22", test_raw_oplock_batch22);
+	torture_suite_add_2smb_test(suite, "batch23", test_raw_oplock_batch23);
+	torture_suite_add_2smb_test(suite, "batch24", test_raw_oplock_batch24);
+	torture_suite_add_2smb_test(suite, "batch25", test_raw_oplock_batch25);
+	torture_suite_add_2smb_test(suite, "batch26", test_raw_oplock_batch26);
+	torture_suite_add_2smb_test(suite, "stream1", test_raw_oplock_stream1);
+	torture_suite_add_1smb_test(suite, "doc1", test_raw_oplock_doc);
+	torture_suite_add_2smb_test(suite, "brl1", test_raw_oplock_brl1);
+	torture_suite_add_1smb_test(suite, "brl2", test_raw_oplock_brl2);
+	torture_suite_add_1smb_test(suite, "brl3", test_raw_oplock_brl3);
 
 	return suite;
 }
diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c
index 3d299a9fb0..88cb1c59a4 100644
--- a/source4/torture/raw/raw.c
+++ b/source4/torture/raw/raw.c
@@ -26,55 +26,54 @@
 NTSTATUS torture_raw_init(void)
 {
 	struct torture_suite *suite = torture_suite_create(
-		talloc_autofree_context(),
-		"RAW");
+		talloc_autofree_context(), "raw");
 	/* RAW smb tests */
-	torture_suite_add_simple_test(suite, "BENCH-OPLOCK", torture_bench_oplock);
-	torture_suite_add_simple_test(suite, "PING-PONG", torture_ping_pong);
-	torture_suite_add_simple_test(suite, "BENCH-LOCK", torture_bench_lock);
-	torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open);
-	torture_suite_add_simple_test(suite, "BENCH-LOOKUP",
+	torture_suite_add_simple_test(suite, "bench-oplock", torture_bench_oplock);
+	torture_suite_add_simple_test(suite, "ping-pong", torture_ping_pong);
+	torture_suite_add_simple_test(suite, "bench-lock", torture_bench_lock);
+	torture_suite_add_simple_test(suite, "bench-open", torture_bench_open);
+	torture_suite_add_simple_test(suite, "bench-lookup",
 		torture_bench_lookup);
-	torture_suite_add_simple_test(suite, "BENCH-TCON",
+	torture_suite_add_simple_test(suite, "bench-tcon",
 		torture_bench_treeconnect);
-	torture_suite_add_simple_test(suite, "OFFLINE", torture_test_offline);
-	torture_suite_add_1smb_test(suite, "QFSINFO", torture_raw_qfsinfo);
-	torture_suite_add_1smb_test(suite, "QFILEINFO", torture_raw_qfileinfo);
-	torture_suite_add_1smb_test(suite, "QFILEINFO-IPC", torture_raw_qfileinfo_pipe);
+	torture_suite_add_simple_test(suite, "offline", torture_test_offline);
+	torture_suite_add_1smb_test(suite, "qfsinfo", torture_raw_qfsinfo);
+	torture_suite_add_1smb_test(suite, "qfileinfo", torture_raw_qfileinfo);
+	torture_suite_add_1smb_test(suite, "qfileinfo.ipc", torture_raw_qfileinfo_pipe);
 	torture_suite_add_suite(suite, torture_raw_sfileinfo(suite));
 	torture_suite_add_suite(suite, torture_raw_search(suite));
-	torture_suite_add_1smb_test(suite, "CLOSE", torture_raw_close);
+	torture_suite_add_1smb_test(suite, "close", torture_raw_close);
 	torture_suite_add_suite(suite, torture_raw_open(suite));
-	torture_suite_add_1smb_test(suite, "MKDIR", torture_raw_mkdir);
+	torture_suite_add_1smb_test(suite, "mkdir", torture_raw_mkdir);
 	torture_suite_add_suite(suite, torture_raw_oplock(suite));
-	torture_suite_add_1smb_test(suite, "HOLD-OPLOCK", torture_hold_oplock);
-	torture_suite_add_2smb_test(suite, "NOTIFY", torture_raw_notify);
-	torture_suite_add_1smb_test(suite, "MUX", torture_raw_mux);
-	torture_suite_add_1smb_test(suite, "IOCTL", torture_raw_ioctl);
-	torture_suite_add_1smb_test(suite, "CHKPATH", torture_raw_chkpath);
+	torture_suite_add_1smb_test(suite, "hold-oplock", torture_hold_oplock);
+	torture_suite_add_2smb_test(suite, "notify", torture_raw_notify);
+	torture_suite_add_1smb_test(suite, "mux", torture_raw_mux);
+	torture_suite_add_1smb_test(suite, "ioctl", torture_raw_ioctl);
+	torture_suite_add_1smb_test(suite, "chkpath", torture_raw_chkpath);
 	torture_suite_add_suite(suite, torture_raw_unlink(suite));
 	torture_suite_add_suite(suite, torture_raw_read(suite));
 	torture_suite_add_suite(suite, torture_raw_write(suite));
 	torture_suite_add_suite(suite, torture_raw_lock(suite));
-	torture_suite_add_1smb_test(suite, "CONTEXT", torture_raw_context);
+	torture_suite_add_1smb_test(suite, "context", torture_raw_context);
 	torture_suite_add_suite(suite, torture_raw_rename(suite));
-	torture_suite_add_1smb_test(suite, "SEEK", torture_raw_seek);
-	torture_suite_add_1smb_test(suite, "EAS", torture_raw_eas);
+	torture_suite_add_1smb_test(suite, "seek", torture_raw_seek);
+	torture_suite_add_1smb_test(suite, "eas", torture_raw_eas);
 	torture_suite_add_suite(suite, torture_raw_streams(suite));
 	torture_suite_add_suite(suite, torture_raw_acls(suite));
-	torture_suite_add_1smb_test(suite, "COMPOSITE", torture_raw_composite);
-	torture_suite_add_simple_test(suite, "SAMBA3HIDE", torture_samba3_hide);
-	torture_suite_add_simple_test(suite, "SAMBA3CLOSEERR", torture_samba3_closeerr);
-	torture_suite_add_simple_test(suite, "SAMBA3ROOTDIRFID",
+	torture_suite_add_1smb_test(suite, "composite", torture_raw_composite);
+	torture_suite_add_simple_test(suite, "samba3hide", torture_samba3_hide);
+	torture_suite_add_simple_test(suite, "samba3closeerr", torture_samba3_closeerr);
+	torture_suite_add_simple_test(suite, "samba3rootdirfid",
 				      torture_samba3_rootdirfid);
-	torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", torture_samba3_checkfsp);
-	torture_suite_add_simple_test(suite, "SAMBA3OPLOCKLOGOFF", torture_samba3_oplock_logoff);
-	torture_suite_add_simple_test(suite, "SAMBA3BADPATH", torture_samba3_badpath);
-	torture_suite_add_simple_test(suite, "SAMBA3CASEINSENSITIVE",
+	torture_suite_add_simple_test(suite, "samba3checkfsp", torture_samba3_checkfsp);
+	torture_suite_add_simple_test(suite, "samba3oplocklogoff", torture_samba3_oplock_logoff);
+	torture_suite_add_simple_test(suite, "samba3badpath", torture_samba3_badpath);
+	torture_suite_add_simple_test(suite, "samba3caseinsensitive",
 				      torture_samba3_caseinsensitive);
-	torture_suite_add_simple_test(suite, "SAMBA3POSIXTIMEDLOCK",
+	torture_suite_add_simple_test(suite, "samba3posixtimedlock",
 				      torture_samba3_posixtimedlock);
-	torture_suite_add_simple_test(suite, "SCAN-EAMAX", torture_max_eas);
+	torture_suite_add_simple_test(suite, "scan-eamax", torture_max_eas);
 
 	suite->description = talloc_strdup(suite, "Tests for the raw SMB interface");
 
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index 430f09be54..3b315afe8d 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -980,14 +980,14 @@ done:
 */
 struct torture_suite *torture_raw_read(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "READ");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "read");
 
 	torture_suite_add_1smb_test(suite, "read", test_read);
 	torture_suite_add_1smb_test(suite, "readx", test_readx);
 	torture_suite_add_1smb_test(suite, "lockread", test_lockread);
 	torture_suite_add_1smb_test(suite, "readbraw", test_readbraw);
 	torture_suite_add_1smb_test(suite, "read for execute", 
-								test_read_for_execute);
+		test_read_for_execute);
 
 	return suite;
 }
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index 187645f964..ca4207119b 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -717,7 +717,7 @@ extern bool test_nttransrename(struct torture_context *tctx, struct smbcli_state
 */
 struct torture_suite *torture_raw_rename(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "RENAME");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "rename");
 
 	torture_suite_add_1smb_test(suite, "mv", test_mv);
 	/* test_trans2rename and test_nttransrename are actually in torture/raw/oplock.c to
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index f5419dc672..60c9ad0bb3 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -1510,7 +1510,7 @@ done:
 */
 struct torture_suite *torture_raw_search(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SEARCH");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "search");
 
 	torture_suite_add_1smb_test(suite, "one file search", test_one_file);
 	torture_suite_add_1smb_test(suite, "many files", test_many_files);
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 1973e7db3e..f3abf5b3de 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -1143,18 +1143,17 @@ done:
 
 struct torture_suite *torture_raw_sfileinfo(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx,
-	    "SFILEINFO");
-
-	torture_suite_add_1smb_test(suite, "BASE", torture_raw_sfileinfo_base);
-	torture_suite_add_1smb_test(suite, "RENAME",
-				      torture_raw_sfileinfo_rename);
-	torture_suite_add_1smb_test(suite, "BUG", torture_raw_sfileinfo_bug);
-	torture_suite_add_2smb_test(suite, "END-OF-FILE",
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "sfileinfo");
+
+	torture_suite_add_1smb_test(suite, "base", torture_raw_sfileinfo_base);
+	torture_suite_add_1smb_test(suite, "rename", torture_raw_sfileinfo_rename);
+	torture_suite_add_1smb_test(suite, "bug", torture_raw_sfileinfo_bug);
+	torture_suite_add_2smb_test(suite, "end-of-file",
 	    torture_raw_sfileinfo_eof);
-	torture_suite_add_2smb_test(suite, "END-OF-FILE-ACCESS",
+	torture_suite_add_2smb_test(suite, "end-of-file-access",
 	    torture_raw_sfileinfo_eof_access);
-	torture_suite_add_1smb_test(suite, "ARCHIVE", torture_raw_sfileinfo_archive);
+	torture_suite_add_1smb_test(suite, "archive",
+								torture_raw_sfileinfo_archive);
 
 	return suite;
 }
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 5d4167dbd3..1542e93422 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -1896,22 +1896,21 @@ static bool test_stream_summary_tab(struct torture_context *tctx,
 */
 struct torture_suite *torture_raw_streams(TALLOC_CTX *tctx)
 {
-	struct torture_suite *suite = torture_suite_create(tctx, "STREAMS");
-
-	torture_suite_add_1smb_test(suite, "DIR", test_stream_dir);
-	torture_suite_add_1smb_test(suite, "IO", test_stream_io);
-	torture_suite_add_1smb_test(suite, "SHAREMODES",
-	    test_stream_sharemodes);
-	torture_suite_add_1smb_test(suite, "DELETE", test_stream_delete);
-	torture_suite_add_1smb_test(suite, "NAMES", test_stream_names);
-	torture_suite_add_1smb_test(suite, "NAMES2", test_stream_names2);
-	torture_suite_add_1smb_test(suite, "RENAME", test_stream_rename);
-	torture_suite_add_1smb_test(suite, "RENAME2", test_stream_rename2);
-	torture_suite_add_1smb_test(suite, "RENAME3", test_stream_rename3);
-	torture_suite_add_1smb_test(suite, "CREATEDISP",
+	struct torture_suite *suite = torture_suite_create(tctx, "streams");
+
+	torture_suite_add_1smb_test(suite, "dir", test_stream_dir);
+	torture_suite_add_1smb_test(suite, "io", test_stream_io);
+	torture_suite_add_1smb_test(suite, "sharemodes", test_stream_sharemodes);
+	torture_suite_add_1smb_test(suite, "delete", test_stream_delete);
+	torture_suite_add_1smb_test(suite, "names", test_stream_names);
+	torture_suite_add_1smb_test(suite, "names2", test_stream_names2);
+	torture_suite_add_1smb_test(suite, "rename", test_stream_rename);
+	torture_suite_add_1smb_test(suite, "rename2", test_stream_rename2);
+	torture_suite_add_1smb_test(suite, "rename3", test_stream_rename3);
+	torture_suite_add_1smb_test(suite, "createdisp",
 	    test_stream_create_disposition);
-	torture_suite_add_1smb_test(suite, "ATTR", test_stream_attributes);
-	torture_suite_add_1smb_test(suite, "SUMTAB", test_stream_summary_tab);
+	torture_suite_add_1smb_test(suite, "attr", test_stream_attributes);
+	torture_suite_add_1smb_test(suite, "sumtab", test_stream_summary_tab);
 
 	/* torture_suite_add_1smb_test(suite, "LARGESTREAMINFO", */
 	/*     test_stream_large_streaminfo); */
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index 9da036e021..d1ad78508f 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -538,11 +538,11 @@ done:
 */
 struct torture_suite *torture_raw_unlink(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "UNLINK");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "unlink");
 
 	torture_suite_add_1smb_test(suite, "unlink", test_unlink);
 	torture_suite_add_1smb_test(suite, "delete_on_close", test_delete_on_close);
-	torture_suite_add_2smb_test(suite, "UNLINK-DEFER", test_unlink_defer);
+	torture_suite_add_2smb_test(suite, "unlink-defer", test_unlink_defer);
 
 	return suite;
 }
diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index 9a2161146e..12c42bf141 100644
--- a/source4/torture/raw/write.c
+++ b/source4/torture/raw/write.c
@@ -726,7 +726,7 @@ done:
 */
 struct torture_suite *torture_raw_write(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "WRITE");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "write");
 
 	torture_suite_add_1smb_test(suite, "write", test_write);
 	torture_suite_add_1smb_test(suite, "write unlock", test_writeunlock);