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

6 files changed, 54 insertions, 55 deletions

diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index 6d3447d772..88dedaa541 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -383,7 +383,7 @@ static bool setpathinfo_aliases(struct torture_context *tctx,
 /* look for aliased info levels in trans2 calls */
 struct torture_suite *torture_trans2_aliases(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "ALIASES");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "aliases");
 
 	torture_suite_add_1smb_test(suite, "QFILEINFO aliases", qfsinfo_aliases);
 	torture_suite_add_1smb_test(suite, "QFSINFO aliases", qfileinfo_aliases);
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 3ed829193f..d7bac459c3 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1869,61 +1869,61 @@ static bool run_birthtimetest(struct torture_context *tctx,
 
 NTSTATUS torture_base_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "BASE");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "base");
 
-	torture_suite_add_2smb_test(suite, "FDPASS", run_fdpasstest);
+	torture_suite_add_2smb_test(suite, "fdpass", run_fdpasstest);
 	torture_suite_add_suite(suite, torture_base_locktest(suite));
-	torture_suite_add_1smb_test(suite, "UNLINK", torture_unlinktest);
-	torture_suite_add_1smb_test(suite, "ATTR",   run_attrtest);
-	torture_suite_add_1smb_test(suite, "TRANS2", run_trans2test);
-        torture_suite_add_1smb_test(suite, "BIRTHTIME", run_birthtimetest);
-	torture_suite_add_simple_test(suite, "NEGNOWAIT", run_negprot_nowait);
-	torture_suite_add_1smb_test(suite, "DIR1",  torture_dirtest1);
-	torture_suite_add_1smb_test(suite, "DIR2",  torture_dirtest2);
-	torture_suite_add_1smb_test(suite, "DENY1",  torture_denytest1);
-	torture_suite_add_2smb_test(suite, "DENY2",  torture_denytest2);
-	torture_suite_add_2smb_test(suite, "DENY3",  torture_denytest3);
-	torture_suite_add_1smb_test(suite, "DENYDOS",  torture_denydos_sharing);
-	torture_suite_add_smb_multi_test(suite, "NTDENY1", torture_ntdenytest1);
-	torture_suite_add_2smb_test(suite, "NTDENY2",  torture_ntdenytest2);
-	torture_suite_add_1smb_test(suite, "TCON",  run_tcon_test);
-	torture_suite_add_1smb_test(suite, "TCONDEV",  run_tcon_devtype_test);
-	torture_suite_add_1smb_test(suite, "VUID", run_vuidtest);
-	torture_suite_add_2smb_test(suite, "RW1",  run_readwritetest);
-	torture_suite_add_2smb_test(suite, "OPEN", run_opentest);
-	torture_suite_add_smb_multi_test(suite, "DEFER_OPEN", run_deferopen);
-	torture_suite_add_1smb_test(suite, "XCOPY", run_xcopy);
-	torture_suite_add_1smb_test(suite, "IOMETER", run_iometer);
-	torture_suite_add_1smb_test(suite, "RENAME", torture_test_rename);
+	torture_suite_add_1smb_test(suite, "unlink", torture_unlinktest);
+	torture_suite_add_1smb_test(suite, "attr",   run_attrtest);
+	torture_suite_add_1smb_test(suite, "trans2", run_trans2test);
+	torture_suite_add_1smb_test(suite, "birthtime", run_birthtimetest);
+	torture_suite_add_simple_test(suite, "negnowait", run_negprot_nowait);
+	torture_suite_add_1smb_test(suite, "dir1",  torture_dirtest1);
+	torture_suite_add_1smb_test(suite, "dir2",  torture_dirtest2);
+	torture_suite_add_1smb_test(suite, "deny1",  torture_denytest1);
+	torture_suite_add_2smb_test(suite, "deny2",  torture_denytest2);
+	torture_suite_add_2smb_test(suite, "deny3",  torture_denytest3);
+	torture_suite_add_1smb_test(suite, "denydos",  torture_denydos_sharing);
+	torture_suite_add_smb_multi_test(suite, "ntdeny1", torture_ntdenytest1);
+	torture_suite_add_2smb_test(suite, "ntdeny2",  torture_ntdenytest2);
+	torture_suite_add_1smb_test(suite, "tcon",  run_tcon_test);
+	torture_suite_add_1smb_test(suite, "tcondev",  run_tcon_devtype_test);
+	torture_suite_add_1smb_test(suite, "vuid", run_vuidtest);
+	torture_suite_add_2smb_test(suite, "rw1",  run_readwritetest);
+	torture_suite_add_2smb_test(suite, "open", run_opentest);
+	torture_suite_add_smb_multi_test(suite, "defer_open", run_deferopen);
+	torture_suite_add_1smb_test(suite, "xcopy", run_xcopy);
+	torture_suite_add_1smb_test(suite, "iometer", run_iometer);
+	torture_suite_add_1smb_test(suite, "rename", torture_test_rename);
 	torture_suite_add_suite(suite, torture_test_delete());
-	torture_suite_add_1smb_test(suite, "PROPERTIES", torture_test_properties);
-	torture_suite_add_1smb_test(suite, "MANGLE", torture_mangle);
-	torture_suite_add_1smb_test(suite, "OPENATTR", torture_openattrtest);
-        torture_suite_add_1smb_test(suite, "WINATTR", torture_winattrtest);
+	torture_suite_add_1smb_test(suite, "properties", torture_test_properties);
+	torture_suite_add_1smb_test(suite, "mangle", torture_mangle);
+	torture_suite_add_1smb_test(suite, "openattr", torture_openattrtest);
+	torture_suite_add_1smb_test(suite, "winattr", torture_winattrtest);
 	torture_suite_add_suite(suite, torture_charset(suite));
-	torture_suite_add_1smb_test(suite, "CHKPATH",  torture_chkpath_test);
-	torture_suite_add_1smb_test(suite, "SECLEAK",  torture_sec_leak);
-	torture_suite_add_simple_test(suite, "DISCONNECT",  torture_disconnect);
+	torture_suite_add_1smb_test(suite, "chkpath",  torture_chkpath_test);
+	torture_suite_add_1smb_test(suite, "secleak",  torture_sec_leak);
+	torture_suite_add_simple_test(suite, "disconnect",  torture_disconnect);
 	torture_suite_add_suite(suite, torture_delay_write());
-	torture_suite_add_simple_test(suite, "SAMBA3ERROR", torture_samba3_errorpaths);
-	torture_suite_add_1smb_test(suite, "CASETABLE", torture_casetable);
-	torture_suite_add_1smb_test(suite, "UTABLE", torture_utable);
-	torture_suite_add_simple_test(suite, "SMB", torture_smb_scan);
+	torture_suite_add_simple_test(suite, "samba3error", torture_samba3_errorpaths);
+	torture_suite_add_1smb_test(suite, "casetable", torture_casetable);
+	torture_suite_add_1smb_test(suite, "utable", torture_utable);
+	torture_suite_add_simple_test(suite, "smb", torture_smb_scan);
 	torture_suite_add_suite(suite, torture_trans2_aliases(suite));
-	torture_suite_add_1smb_test(suite, "TRANS2-SCAN", torture_trans2_scan);
-	torture_suite_add_1smb_test(suite, "NTTRANS", torture_nttrans_scan);
-	torture_suite_add_1smb_test(suite, "CREATEX_ACCESS", torture_createx_access);
-	torture_suite_add_2smb_test(suite, "CREATEX_SHAREMODES_FILE", torture_createx_sharemodes_file);
-	torture_suite_add_2smb_test(suite, "CREATEX_SHAREMODES_DIR", torture_createx_sharemodes_dir);
-	torture_suite_add_1smb_test(suite, "MAXIMUM_ALLOWED", torture_maximum_allowed);
-
-	torture_suite_add_simple_test(suite, "BENCH-HOLDCON", torture_holdcon);
-	torture_suite_add_1smb_test(suite, "BENCH-HOLDOPEN", torture_holdopen);
-	torture_suite_add_simple_test(suite, "BENCH-READWRITE", run_benchrw);
-	torture_suite_add_smb_multi_test(suite, "BENCH-TORTURE", run_torture);
-	torture_suite_add_1smb_test(suite, "SCAN-PIPE_NUMBER", run_pipe_number);
-	torture_suite_add_1smb_test(suite, "SCAN-IOCTL", torture_ioctl_test);
-	torture_suite_add_smb_multi_test(suite, "SCAN-MAXFID", run_maxfidtest);
+	torture_suite_add_1smb_test(suite, "trans2-scan", torture_trans2_scan);
+	torture_suite_add_1smb_test(suite, "nttrans", torture_nttrans_scan);
+	torture_suite_add_1smb_test(suite, "createx_access", torture_createx_access);
+	torture_suite_add_2smb_test(suite, "createx_sharemodes_file", torture_createx_sharemodes_file);
+	torture_suite_add_2smb_test(suite, "createx_sharemodes_dir", torture_createx_sharemodes_dir);
+	torture_suite_add_1smb_test(suite, "maximum_allowed", torture_maximum_allowed);
+
+	torture_suite_add_simple_test(suite, "bench-holdcon", torture_holdcon);
+	torture_suite_add_1smb_test(suite, "bench-holdopen", torture_holdopen);
+	torture_suite_add_simple_test(suite, "bench-readwrite", run_benchrw);
+	torture_suite_add_smb_multi_test(suite, "bench-torture", run_torture);
+	torture_suite_add_1smb_test(suite, "scan-pipe_number", run_pipe_number);
+	torture_suite_add_1smb_test(suite, "scan-ioctl", torture_ioctl_test);
+	torture_suite_add_smb_multi_test(suite, "scan-maxfid", run_maxfidtest);
 
 	suite->description = talloc_strdup(suite, 
 					"Basic SMB tests (imported from the original smbtorture)");
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index b4221a75b6..bdac2de18b 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -197,7 +197,7 @@ static bool test_widea(struct torture_context *tctx,
 
 struct torture_suite *torture_charset(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "CHARSET");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "charset");
 
 	torture_suite_add_1smb_test(suite, "Testing composite character (a umlaut)", test_composed); 
 	torture_suite_add_1smb_test(suite, "Testing naked diacritical (umlaut)", test_diacritical);
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index f82b32fe8d..97968fb0b8 100644
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/torture/basic/delaywrite.c
@@ -3102,7 +3102,7 @@ static bool test_delayed_write_update7(struct torture_context *tctx, struct smbc
 */
 struct torture_suite *torture_delay_write(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "DELAYWRITE");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "delaywrite");
 
 	torture_suite_add_2smb_test(suite, "finfo update on close", test_finfo_after_write);
 	torture_suite_add_1smb_test(suite, "delayed update of write time", test_delayed_write_update);
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index 2b26b1e64a..888c5a6b46 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -1586,8 +1586,7 @@ static bool deltest23(struct torture_context *tctx,
 struct torture_suite *torture_test_delete(void)
 {
 	struct torture_suite *suite = torture_suite_create(
-		talloc_autofree_context(),
-		"DELETE");
+		talloc_autofree_context(), "delete");
 
 	torture_suite_add_2smb_test(suite, "deltest1", deltest1);
 	torture_suite_add_2smb_test(suite, "deltest2", deltest2);
diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index 71364ef578..86cba4e852 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -802,7 +802,7 @@ fail:
 
 struct torture_suite *torture_base_locktest(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_2smb_test(suite, "LOCK1", torture_locktest1);
 	torture_suite_add_1smb_test(suite, "LOCK2", torture_locktest2);
 	torture_suite_add_2smb_test(suite, "LOCK3", torture_locktest3);