From 35fbc7bbda5851f7172538f79fc79be201f1d521 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 11 Dec 2010 03:26:31 +0100 Subject: 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 Autobuild-Date: Sat Dec 11 04:16:13 CET 2010 on sn-devel-104 --- source4/torture/smb2/acls.c | 2 +- source4/torture/smb2/compound.c | 21 +++++------ source4/torture/smb2/create.c | 24 ++++++------ source4/torture/smb2/dir.c | 20 +++++----- source4/torture/smb2/durable_open.c | 12 +++--- source4/torture/smb2/lease.c | 12 +++--- source4/torture/smb2/lock.c | 44 +++++++++++----------- source4/torture/smb2/notify.c | 32 ++++++++-------- source4/torture/smb2/oplock.c | 74 ++++++++++++++++++------------------- source4/torture/smb2/read.c | 8 ++-- source4/torture/smb2/smb2.c | 20 +++++----- source4/torture/smb2/streams.c | 24 ++++++------ 12 files changed, 146 insertions(+), 147 deletions(-) (limited to 'source4/torture/smb2') diff --git a/source4/torture/smb2/acls.c b/source4/torture/smb2/acls.c index d723ae499b..3883ae5055 100644 --- a/source4/torture/smb2/acls.c +++ b/source4/torture/smb2/acls.c @@ -1855,7 +1855,7 @@ done: */ struct torture_suite *torture_smb2_acls_init(void) { - struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "ACLS"); + struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "acls"); torture_suite_add_1smb2_test(suite, "CREATOR", test_creator_sid); torture_suite_add_1smb2_test(suite, "GENERIC", test_generic_bits); diff --git a/source4/torture/smb2/compound.c b/source4/torture/smb2/compound.c index bb506a0139..59ed9b1e61 100644 --- a/source4/torture/smb2/compound.c +++ b/source4/torture/smb2/compound.c @@ -602,17 +602,16 @@ done: struct torture_suite *torture_smb2_compound_init(void) { - struct torture_suite *suite = - torture_suite_create(talloc_autofree_context(), "COMPOUND"); - - torture_suite_add_1smb2_test(suite, "RELATED1", test_compound_related1); - torture_suite_add_1smb2_test(suite, "RELATED2", test_compound_related2); - torture_suite_add_1smb2_test(suite, "UNRELATED1", test_compound_unrelated1); - torture_suite_add_1smb2_test(suite, "INVALID1", test_compound_invalid1); - torture_suite_add_1smb2_test(suite, "INVALID2", test_compound_invalid2); - torture_suite_add_1smb2_test(suite, "INVALID3", test_compound_invalid3); - torture_suite_add_1smb2_test(suite, "INTERIM1", test_compound_interim1); - torture_suite_add_1smb2_test(suite, "INTERIM2", test_compound_interim2); + struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "compound"); + + torture_suite_add_1smb2_test(suite, "related1", test_compound_related1); + torture_suite_add_1smb2_test(suite, "related2", test_compound_related2); + torture_suite_add_1smb2_test(suite, "unrelated1", test_compound_unrelated1); + torture_suite_add_1smb2_test(suite, "invalid1", test_compound_invalid1); + torture_suite_add_1smb2_test(suite, "invalid2", test_compound_invalid2); + torture_suite_add_1smb2_test(suite, "invalid3", test_compound_invalid3); + torture_suite_add_1smb2_test(suite, "interim1", test_compound_interim1); + torture_suite_add_1smb2_test(suite, "interim2", test_compound_interim2); suite->description = talloc_strdup(suite, "SMB2-COMPOUND tests"); diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c index 3b88bd9588..f11c8375b1 100644 --- a/source4/torture/smb2/create.c +++ b/source4/torture/smb2/create.c @@ -1384,18 +1384,18 @@ done: */ struct torture_suite *torture_smb2_create_init(void) { - struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "CREATE"); - - torture_suite_add_1smb2_test(suite, "GENTEST", test_create_gentest); - torture_suite_add_1smb2_test(suite, "BLOB", test_create_blob); - torture_suite_add_1smb2_test(suite, "OPEN", test_smb2_open); - torture_suite_add_1smb2_test(suite, "BRLOCKED", test_smb2_open_brlocked); - torture_suite_add_1smb2_test(suite, "MULTI", test_smb2_open_multi); - torture_suite_add_1smb2_test(suite, "DELETE", test_smb2_open_for_delete); - torture_suite_add_1smb2_test(suite, "LEADING-SLASH", test_smb2_leading_slash); - torture_suite_add_1smb2_test(suite, "ACLFILE", test_create_acl_file); - torture_suite_add_1smb2_test(suite, "ACLDIR", test_create_acl_dir); - torture_suite_add_1smb2_test(suite, "NULLDACL", test_create_null_dacl); + struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "create"); + + torture_suite_add_1smb2_test(suite, "gentest", test_create_gentest); + torture_suite_add_1smb2_test(suite, "blob", test_create_blob); + torture_suite_add_1smb2_test(suite, "open", test_smb2_open); + torture_suite_add_1smb2_test(suite, "brlocked", test_smb2_open_brlocked); + torture_suite_add_1smb2_test(suite, "multi", test_smb2_open_multi); + torture_suite_add_1smb2_test(suite, "delete", test_smb2_open_for_delete); + torture_suite_add_1smb2_test(suite, "leading-slash", test_smb2_leading_slash); + torture_suite_add_1smb2_test(suite, "aclfile", test_create_acl_file); + torture_suite_add_1smb2_test(suite, "acldir", test_create_acl_dir); + torture_suite_add_1smb2_test(suite, "nulldacl", test_create_null_dacl); suite->description = talloc_strdup(suite, "SMB2-CREATE tests"); diff --git a/source4/torture/smb2/dir.c b/source4/torture/smb2/dir.c index dbd1a19a45..8cf0e1f35c 100644 --- a/source4/torture/smb2/dir.c +++ b/source4/torture/smb2/dir.c @@ -1330,16 +1330,16 @@ done: struct torture_suite *torture_smb2_dir_init(void) { struct torture_suite *suite = - torture_suite_create(talloc_autofree_context(), "DIR"); - - torture_suite_add_1smb2_test(suite, "FIND", test_find); - torture_suite_add_1smb2_test(suite, "FIXED", test_fixed); - torture_suite_add_1smb2_test(suite, "ONE", test_one_file); - torture_suite_add_1smb2_test(suite, "MANY", test_many_files); - torture_suite_add_1smb2_test(suite, "MODIFY", test_modify_search); - torture_suite_add_1smb2_test(suite, "SORTED", test_sorted); - torture_suite_add_1smb2_test(suite, "FILE-INDEX", test_file_index); - torture_suite_add_1smb2_test(suite, "LARGE-FILES", test_large_files); + torture_suite_create(talloc_autofree_context(), "dir"); + + torture_suite_add_1smb2_test(suite, "find", test_find); + torture_suite_add_1smb2_test(suite, "fixed", test_fixed); + torture_suite_add_1smb2_test(suite, "one", test_one_file); + torture_suite_add_1smb2_test(suite, "many", test_many_files); + torture_suite_add_1smb2_test(suite, "modify", test_modify_search); + torture_suite_add_1smb2_test(suite, "sorted", test_sorted); + torture_suite_add_1smb2_test(suite, "file-index", test_file_index); + torture_suite_add_1smb2_test(suite, "large-files", test_large_files); suite->description = talloc_strdup(suite, "SMB2-DIR tests"); return suite; diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c index d182744b35..7a85443f25 100644 --- a/source4/torture/smb2/durable_open.c +++ b/source4/torture/smb2/durable_open.c @@ -586,14 +586,14 @@ bool test_durable_open_open(struct torture_context *tctx, struct torture_suite *torture_smb2_durable_open_init(void) { struct torture_suite *suite = - torture_suite_create(talloc_autofree_context(), "DURABLE-OPEN"); + torture_suite_create(talloc_autofree_context(), "durable-open"); - torture_suite_add_2smb2_test(suite, "FILE-POSITION", + torture_suite_add_2smb2_test(suite, "file-position", test_durable_open_file_position); - torture_suite_add_2smb2_test(suite, "OPLOCK", test_durable_open_oplock); - torture_suite_add_2smb2_test(suite, "LEASE", test_durable_open_lease); - torture_suite_add_1smb2_test(suite, "LOCK", test_durable_open_lock); - torture_suite_add_2smb2_test(suite, "OPEN", test_durable_open_open); + torture_suite_add_2smb2_test(suite, "oplock", test_durable_open_oplock); + torture_suite_add_2smb2_test(suite, "lease", test_durable_open_lease); + torture_suite_add_1smb2_test(suite, "lock", test_durable_open_lock); + torture_suite_add_2smb2_test(suite, "open", test_durable_open_open); suite->description = talloc_strdup(suite, "SMB2-DURABLE-OPEN tests"); diff --git a/source4/torture/smb2/lease.c b/source4/torture/smb2/lease.c index eda3b97eea..564394f31e 100644 --- a/source4/torture/smb2/lease.c +++ b/source4/torture/smb2/lease.c @@ -832,13 +832,13 @@ static bool test_lease_multibreak(struct torture_context *tctx, struct torture_suite *torture_smb2_lease_init(void) { struct torture_suite *suite = - torture_suite_create(talloc_autofree_context(), "LEASE"); + torture_suite_create(talloc_autofree_context(), "lease"); - torture_suite_add_1smb2_test(suite, "REQUEST", test_lease_request); - torture_suite_add_1smb2_test(suite, "UPGRADE", test_lease_upgrade); - torture_suite_add_1smb2_test(suite, "BREAK", test_lease_break); - torture_suite_add_1smb2_test(suite, "OPLOCK", test_lease_oplock); - torture_suite_add_1smb2_test(suite, "MULTIBREAK", test_lease_multibreak); + torture_suite_add_1smb2_test(suite, "request", test_lease_request); + torture_suite_add_1smb2_test(suite, "upgrade", test_lease_upgrade); + torture_suite_add_1smb2_test(suite, "break", test_lease_break); + torture_suite_add_1smb2_test(suite, "oplock", test_lease_oplock); + torture_suite_add_1smb2_test(suite, "multibreak", test_lease_multibreak); suite->description = talloc_strdup(suite, "SMB2-LEASE tests"); diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c index ad66b6236b..fe82813345 100644 --- a/source4/torture/smb2/lock.c +++ b/source4/torture/smb2/lock.c @@ -2853,36 +2853,36 @@ done: struct torture_suite *torture_smb2_lock_init(void) { struct torture_suite *suite = - torture_suite_create(talloc_autofree_context(), "LOCK"); + torture_suite_create(talloc_autofree_context(), "lock"); - torture_suite_add_1smb2_test(suite, "VALID-REQUEST", + torture_suite_add_1smb2_test(suite, "valid-request", test_valid_request); - torture_suite_add_1smb2_test(suite, "RW-NONE", test_lock_rw_none); - torture_suite_add_1smb2_test(suite, "RW-SHARED", test_lock_rw_shared); - torture_suite_add_1smb2_test(suite, "RW-EXCLUSIVE", + torture_suite_add_1smb2_test(suite, "rw-none", test_lock_rw_none); + torture_suite_add_1smb2_test(suite, "rw-shared", test_lock_rw_shared); + torture_suite_add_1smb2_test(suite, "rw-exclusive", test_lock_rw_exclusive); - torture_suite_add_1smb2_test(suite, "AUTO-UNLOCK", + torture_suite_add_1smb2_test(suite, "auto-unlock", test_lock_auto_unlock); - torture_suite_add_1smb2_test(suite, "LOCK", test_lock); - torture_suite_add_1smb2_test(suite, "ASYNC", test_async); - torture_suite_add_1smb2_test(suite, "CANCEL", test_cancel); - torture_suite_add_1smb2_test(suite, "CANCEL-TDIS", test_cancel_tdis); - torture_suite_add_1smb2_test(suite, "CANCEL-LOGOFF", + torture_suite_add_1smb2_test(suite, "lock", test_lock); + torture_suite_add_1smb2_test(suite, "async", test_async); + torture_suite_add_1smb2_test(suite, "cancel", test_cancel); + torture_suite_add_1smb2_test(suite, "cancel-tdis", test_cancel_tdis); + torture_suite_add_1smb2_test(suite, "cancel-logoff", test_cancel_logoff); - torture_suite_add_1smb2_test(suite, "ERRORCODE", test_errorcode); - torture_suite_add_1smb2_test(suite, "ZEROBYTELENGTH", + torture_suite_add_1smb2_test(suite, "errorcode", test_errorcode); + torture_suite_add_1smb2_test(suite, "zerobytelength", test_zerobytelength); - torture_suite_add_1smb2_test(suite, "ZEROBYTEREAD", + torture_suite_add_1smb2_test(suite, "zerobyteread", test_zerobyteread); - torture_suite_add_1smb2_test(suite, "UNLOCK", test_unlock); - torture_suite_add_1smb2_test(suite, "MULTIPLE-UNLOCK", + torture_suite_add_1smb2_test(suite, "unlock", test_unlock); + torture_suite_add_1smb2_test(suite, "multiple-unlock", test_multiple_unlock); - torture_suite_add_1smb2_test(suite, "STACKING", test_stacking); - torture_suite_add_1smb2_test(suite, "CONTEND", test_contend); - torture_suite_add_1smb2_test(suite, "CONTEXT", test_context); - torture_suite_add_1smb2_test(suite, "RANGE", test_range); - torture_suite_add_2smb2_test(suite, "OVERLAP", test_overlap); - torture_suite_add_1smb2_test(suite, "TRUNCATE", test_truncate); + torture_suite_add_1smb2_test(suite, "stacking", test_stacking); + torture_suite_add_1smb2_test(suite, "contend", test_contend); + torture_suite_add_1smb2_test(suite, "context", test_context); + torture_suite_add_1smb2_test(suite, "range", test_range); + torture_suite_add_2smb2_test(suite, "overlap", test_overlap); + torture_suite_add_1smb2_test(suite, "truncate", test_truncate); suite->description = talloc_strdup(suite, "SMB2-LOCK tests"); diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c index 0115cd0478..80c560be00 100644 --- a/source4/torture/smb2/notify.c +++ b/source4/torture/smb2/notify.c @@ -1974,22 +1974,22 @@ done: */ struct torture_suite *torture_smb2_notify_init(void) { - struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "NOTIFY"); - - torture_suite_add_1smb2_test(suite, "VALID-REQ", test_valid_request); - torture_suite_add_1smb2_test(suite, "TCON", torture_smb2_notify_tcon); - torture_suite_add_2smb2_test(suite, "DIR", torture_smb2_notify_dir); - torture_suite_add_2smb2_test(suite, "MASK", torture_smb2_notify_mask); - torture_suite_add_1smb2_test(suite, "TDIS", torture_smb2_notify_tree_disconnect); - torture_suite_add_2smb2_test(suite, "MASK-CHANGE", torture_smb2_notify_mask_change); - torture_suite_add_2smb2_test(suite, "LOGOFF", torture_smb2_notify_ulogoff); - torture_suite_add_1smb2_test(suite, "TREE", torture_smb2_notify_tree); - torture_suite_add_2smb2_test(suite, "BASEDIR", torture_smb2_notify_basedir); - torture_suite_add_2smb2_test(suite, "DOUBLE", torture_smb2_notify_double); - torture_suite_add_1smb2_test(suite, "FILE", torture_smb2_notify_file); - torture_suite_add_1smb2_test(suite, "TCP", torture_smb2_notify_tcp_disconnect); - torture_suite_add_2smb2_test(suite, "REC", torture_smb2_notify_recursive); - torture_suite_add_1smb2_test(suite, "OVERFLOW", torture_smb2_notify_overflow); + struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "notify"); + + torture_suite_add_1smb2_test(suite, "valid-req", test_valid_request); + torture_suite_add_1smb2_test(suite, "tcon", torture_smb2_notify_tcon); + torture_suite_add_2smb2_test(suite, "dir", torture_smb2_notify_dir); + torture_suite_add_2smb2_test(suite, "mask", torture_smb2_notify_mask); + torture_suite_add_1smb2_test(suite, "tdis", torture_smb2_notify_tree_disconnect); + torture_suite_add_2smb2_test(suite, "mask-change", torture_smb2_notify_mask_change); + torture_suite_add_2smb2_test(suite, "logoff", torture_smb2_notify_ulogoff); + torture_suite_add_1smb2_test(suite, "tree", torture_smb2_notify_tree); + torture_suite_add_2smb2_test(suite, "basedir", torture_smb2_notify_basedir); + torture_suite_add_2smb2_test(suite, "double", torture_smb2_notify_double); + torture_suite_add_1smb2_test(suite, "file", torture_smb2_notify_file); + torture_suite_add_1smb2_test(suite, "tcp", torture_smb2_notify_tcp_disconnect); + torture_suite_add_2smb2_test(suite, "rec", torture_smb2_notify_recursive); + torture_suite_add_1smb2_test(suite, "overflow", torture_smb2_notify_overflow); suite->description = talloc_strdup(suite, "SMB2-NOTIFY tests"); diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c index 5261b58473..eeea03639a 100644 --- a/source4/torture/smb2/oplock.c +++ b/source4/torture/smb2/oplock.c @@ -3361,43 +3361,43 @@ static bool test_smb2_oplock_levelII500(struct torture_context *tctx, struct torture_suite *torture_smb2_oplocks_init(void) { struct torture_suite *suite = - torture_suite_create(talloc_autofree_context(), "OPLOCK"); - - torture_suite_add_2smb2_test(suite, "EXCLUSIVE1", test_smb2_oplock_exclusive1); - torture_suite_add_2smb2_test(suite, "EXCLUSIVE2", test_smb2_oplock_exclusive2); - torture_suite_add_2smb2_test(suite, "EXCLUSIVE3", test_smb2_oplock_exclusive3); - torture_suite_add_2smb2_test(suite, "EXCLUSIVE4", test_smb2_oplock_exclusive4); - torture_suite_add_2smb2_test(suite, "EXCLUSIVE5", test_smb2_oplock_exclusive5); - torture_suite_add_2smb2_test(suite, "EXCLUSIVE6", test_smb2_oplock_exclusive6); - torture_suite_add_2smb2_test(suite, "BATCH1", test_smb2_oplock_batch1); - torture_suite_add_2smb2_test(suite, "BATCH2", test_smb2_oplock_batch2); - torture_suite_add_2smb2_test(suite, "BATCH3", test_smb2_oplock_batch3); - torture_suite_add_2smb2_test(suite, "BATCH4", test_smb2_oplock_batch4); - torture_suite_add_2smb2_test(suite, "BATCH5", test_smb2_oplock_batch5); - torture_suite_add_2smb2_test(suite, "BATCH6", test_smb2_oplock_batch6); - torture_suite_add_2smb2_test(suite, "BATCH7", test_smb2_oplock_batch7); - torture_suite_add_2smb2_test(suite, "BATCH8", test_smb2_oplock_batch8); - torture_suite_add_2smb2_test(suite, "BATCH9", test_smb2_oplock_batch9); - torture_suite_add_2smb2_test(suite, "BATCH10", test_smb2_oplock_batch10); - torture_suite_add_2smb2_test(suite, "BATCH11", test_smb2_oplock_batch11); - torture_suite_add_2smb2_test(suite, "BATCH12", test_smb2_oplock_batch12); - torture_suite_add_2smb2_test(suite, "BATCH13", test_smb2_oplock_batch13); - torture_suite_add_2smb2_test(suite, "BATCH14", test_smb2_oplock_batch14); - torture_suite_add_2smb2_test(suite, "BATCH15", test_smb2_oplock_batch15); - torture_suite_add_2smb2_test(suite, "BATCH16", test_smb2_oplock_batch16); - torture_suite_add_1smb2_test(suite, "BATCH19", test_smb2_oplock_batch19); - torture_suite_add_2smb2_test(suite, "BATCH20", test_smb2_oplock_batch20); - torture_suite_add_1smb2_test(suite, "BATCH21", test_smb2_oplock_batch21); - torture_suite_add_1smb2_test(suite, "BATCH22", test_smb2_oplock_batch22); - torture_suite_add_2smb2_test(suite, "BATCH23", test_smb2_oplock_batch23); - torture_suite_add_2smb2_test(suite, "BATCH24", test_smb2_oplock_batch24); - torture_suite_add_1smb2_test(suite, "BATCH25", test_smb2_oplock_batch25); - torture_suite_add_2smb2_test(suite, "STREAM1", test_raw_oplock_stream1); - torture_suite_add_1smb2_test(suite, "DOC", test_smb2_oplock_doc); - torture_suite_add_2smb2_test(suite, "BRL1", test_smb2_oplock_brl1); - torture_suite_add_1smb2_test(suite, "BRL2", test_smb2_oplock_brl2); - torture_suite_add_1smb2_test(suite, "BRL3", test_smb2_oplock_brl3); - torture_suite_add_1smb2_test(suite, "LEVELII500", test_smb2_oplock_levelII500); + torture_suite_create(talloc_autofree_context(), "oplock"); + + torture_suite_add_2smb2_test(suite, "exclusive1", test_smb2_oplock_exclusive1); + torture_suite_add_2smb2_test(suite, "exclusive2", test_smb2_oplock_exclusive2); + torture_suite_add_2smb2_test(suite, "exclusive3", test_smb2_oplock_exclusive3); + torture_suite_add_2smb2_test(suite, "exclusive4", test_smb2_oplock_exclusive4); + torture_suite_add_2smb2_test(suite, "exclusive5", test_smb2_oplock_exclusive5); + torture_suite_add_2smb2_test(suite, "exclusive6", test_smb2_oplock_exclusive6); + torture_suite_add_2smb2_test(suite, "batch1", test_smb2_oplock_batch1); + torture_suite_add_2smb2_test(suite, "batch2", test_smb2_oplock_batch2); + torture_suite_add_2smb2_test(suite, "batch3", test_smb2_oplock_batch3); + torture_suite_add_2smb2_test(suite, "batch4", test_smb2_oplock_batch4); + torture_suite_add_2smb2_test(suite, "batch5", test_smb2_oplock_batch5); + torture_suite_add_2smb2_test(suite, "batch6", test_smb2_oplock_batch6); + torture_suite_add_2smb2_test(suite, "batch7", test_smb2_oplock_batch7); + torture_suite_add_2smb2_test(suite, "batch8", test_smb2_oplock_batch8); + torture_suite_add_2smb2_test(suite, "batch9", test_smb2_oplock_batch9); + torture_suite_add_2smb2_test(suite, "batch10", test_smb2_oplock_batch10); + torture_suite_add_2smb2_test(suite, "batch11", test_smb2_oplock_batch11); + torture_suite_add_2smb2_test(suite, "batch12", test_smb2_oplock_batch12); + torture_suite_add_2smb2_test(suite, "batch13", test_smb2_oplock_batch13); + torture_suite_add_2smb2_test(suite, "batch14", test_smb2_oplock_batch14); + torture_suite_add_2smb2_test(suite, "batch15", test_smb2_oplock_batch15); + torture_suite_add_2smb2_test(suite, "batch16", test_smb2_oplock_batch16); + torture_suite_add_1smb2_test(suite, "batch19", test_smb2_oplock_batch19); + torture_suite_add_2smb2_test(suite, "batch20", test_smb2_oplock_batch20); + torture_suite_add_1smb2_test(suite, "batch21", test_smb2_oplock_batch21); + torture_suite_add_1smb2_test(suite, "batch22", test_smb2_oplock_batch22); + torture_suite_add_2smb2_test(suite, "batch23", test_smb2_oplock_batch23); + torture_suite_add_2smb2_test(suite, "batch24", test_smb2_oplock_batch24); + torture_suite_add_1smb2_test(suite, "batch25", test_smb2_oplock_batch25); + torture_suite_add_2smb2_test(suite, "stream1", test_raw_oplock_stream1); + torture_suite_add_1smb2_test(suite, "doc", test_smb2_oplock_doc); + torture_suite_add_2smb2_test(suite, "brl1", test_smb2_oplock_brl1); + torture_suite_add_1smb2_test(suite, "brl2", test_smb2_oplock_brl2); + torture_suite_add_1smb2_test(suite, "brl3", test_smb2_oplock_brl3); + torture_suite_add_1smb2_test(suite, "levelii500", test_smb2_oplock_levelII500); suite->description = talloc_strdup(suite, "SMB2-OPLOCK tests"); diff --git a/source4/torture/smb2/read.c b/source4/torture/smb2/read.c index cbd59d8b66..f27ce24413 100644 --- a/source4/torture/smb2/read.c +++ b/source4/torture/smb2/read.c @@ -231,11 +231,11 @@ done: */ struct torture_suite *torture_smb2_read_init(void) { - struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "READ"); + struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "read"); - torture_suite_add_1smb2_test(suite, "EOF", test_read_eof); - torture_suite_add_1smb2_test(suite, "POSITION", test_read_position); - torture_suite_add_1smb2_test(suite, "DIR", test_read_dir); + torture_suite_add_1smb2_test(suite, "eof", test_read_eof); + torture_suite_add_1smb2_test(suite, "position", test_read_position); + torture_suite_add_1smb2_test(suite, "dir", test_read_dir); suite->description = talloc_strdup(suite, "SMB2-READ tests"); diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c index da5d9b3e78..0126cf169c 100644 --- a/source4/torture/smb2/smb2.c +++ b/source4/torture/smb2/smb2.c @@ -125,14 +125,14 @@ struct torture_test *torture_suite_add_2smb2_test(struct torture_suite *suite, NTSTATUS torture_smb2_init(void) { - struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "SMB2"); - torture_suite_add_simple_test(suite, "CONNECT", torture_smb2_connect); - torture_suite_add_simple_test(suite, "SCAN", torture_smb2_scan); - torture_suite_add_simple_test(suite, "SCANGETINFO", torture_smb2_getinfo_scan); - torture_suite_add_simple_test(suite, "SCANSETINFO", torture_smb2_setinfo_scan); - torture_suite_add_simple_test(suite, "SCANFIND", torture_smb2_find_scan); - torture_suite_add_simple_test(suite, "GETINFO", torture_smb2_getinfo); - torture_suite_add_simple_test(suite, "SETINFO", torture_smb2_setinfo); + struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "smb2"); + torture_suite_add_simple_test(suite, "connect", torture_smb2_connect); + torture_suite_add_simple_test(suite, "scan", torture_smb2_scan); + torture_suite_add_simple_test(suite, "scangetinfo", torture_smb2_getinfo_scan); + torture_suite_add_simple_test(suite, "scansetinfo", torture_smb2_setinfo_scan); + torture_suite_add_simple_test(suite, "scanfind", torture_smb2_find_scan); + torture_suite_add_simple_test(suite, "getinfo", torture_smb2_getinfo); + torture_suite_add_simple_test(suite, "setinfo", torture_smb2_setinfo); torture_suite_add_suite(suite, torture_smb2_lock_init()); torture_suite_add_suite(suite, torture_smb2_read_init()); torture_suite_add_suite(suite, torture_smb2_create_init()); @@ -144,8 +144,8 @@ NTSTATUS torture_smb2_init(void) torture_suite_add_suite(suite, torture_smb2_compound_init()); torture_suite_add_suite(suite, torture_smb2_oplocks_init()); torture_suite_add_suite(suite, torture_smb2_streams_init()); - torture_suite_add_1smb2_test(suite, "BENCH-OPLOCK", test_smb2_bench_oplock); - torture_suite_add_1smb2_test(suite, "HOLD-OPLOCK", test_smb2_hold_oplock); + torture_suite_add_1smb2_test(suite, "bench-oplock", test_smb2_bench_oplock); + torture_suite_add_1smb2_test(suite, "hold-oplock", test_smb2_hold_oplock); suite->description = talloc_strdup(suite, "SMB2-specific tests"); diff --git a/source4/torture/smb2/streams.c b/source4/torture/smb2/streams.c index f4e83c9ad3..a679ee2e5c 100644 --- a/source4/torture/smb2/streams.c +++ b/source4/torture/smb2/streams.c @@ -1738,18 +1738,18 @@ done: struct torture_suite *torture_smb2_streams_init(void) { struct torture_suite *suite = - torture_suite_create(talloc_autofree_context(), "STREAMS"); - - torture_suite_add_1smb2_test(suite, "DIR", test_stream_dir); - torture_suite_add_1smb2_test(suite, "IO", test_stream_io); - torture_suite_add_1smb2_test(suite, "SHAREMODES", test_stream_sharemodes); - torture_suite_add_1smb2_test(suite, "NAMES", test_stream_names); - torture_suite_add_1smb2_test(suite, "NAMES2", test_stream_names2); - torture_suite_add_1smb2_test(suite, "RENAME", test_stream_rename); - torture_suite_add_1smb2_test(suite, "RENAME2", test_stream_rename2); - torture_suite_add_1smb2_test(suite, "CREATE-DISPOSITION", test_stream_create_disposition); - torture_suite_add_1smb2_test(suite, "ATTRIBUTES", test_stream_attributes); - torture_suite_add_1smb2_test(suite, "DELETE", test_stream_delete); + torture_suite_create(talloc_autofree_context(), "streams"); + + torture_suite_add_1smb2_test(suite, "dir", test_stream_dir); + torture_suite_add_1smb2_test(suite, "io", test_stream_io); + torture_suite_add_1smb2_test(suite, "sharemodes", test_stream_sharemodes); + torture_suite_add_1smb2_test(suite, "names", test_stream_names); + torture_suite_add_1smb2_test(suite, "names2", test_stream_names2); + torture_suite_add_1smb2_test(suite, "rename", test_stream_rename); + torture_suite_add_1smb2_test(suite, "rename2", test_stream_rename2); + torture_suite_add_1smb2_test(suite, "create-disposition", test_stream_create_disposition); + torture_suite_add_1smb2_test(suite, "attributes", test_stream_attributes); + torture_suite_add_1smb2_test(suite, "delete", test_stream_delete); suite->description = talloc_strdup(suite, "SMB2-STREAM tests"); -- cgit