summaryrefslogtreecommitdiff
path: root/source4/torture/smb2/create.c
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2022-03-28 12:38:58 +0200
committerJeremy Allison <jra@samba.org>2022-03-31 23:01:37 +0000
commit8532d7b38cdb8538336d9ffc8e818e818e2d72d9 (patch)
tree0ba3472eeb6d936e46d3d87927c16ba07513b8f2 /source4/torture/smb2/create.c
parent24f4bea5b8eb3c71ca85c9444d57b736078525d9 (diff)
downloadsamba-8532d7b38cdb8538336d9ffc8e818e818e2d72d9.tar.gz
CI: consolidate SMB2-FILEID and SMB2-FILEID-UNIQUE torture test suites
We don't need seperate test suites here, all tests are related to File-Ids. Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4/torture/smb2/create.c')
-rw-r--r--source4/torture/smb2/create.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index 433fbe085f0..b85fe2362b9 100644
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -3171,28 +3171,10 @@ struct torture_suite *torture_smb2_fileid_init(TALLOC_CTX *ctx)
torture_suite_add_1smb2_test(suite, "fileid", test_fileid);
torture_suite_add_1smb2_test(suite, "fileid-dir", test_fileid_dir);
+ torture_suite_add_1smb2_test(suite, "unique", test_fileid_unique);
+ torture_suite_add_1smb2_test(suite, "unique-dir", test_fileid_unique_dir);
- suite->description = talloc_strdup(suite, "SMB2-CREATE tests");
-
- return suite;
-}
-
-/*
- Testing for uniqueness of SMB2 File-IDs
-*/
-struct torture_suite *torture_smb2_fileid_unique_init(TALLOC_CTX *ctx)
-{
- struct torture_suite *suite = torture_suite_create(ctx,
- "fileid_unique");
-
- torture_suite_add_1smb2_test(suite,
- "fileid_unique",
- test_fileid_unique);
- torture_suite_add_1smb2_test(suite,
- "fileid_unique-dir",
- test_fileid_unique_dir);
-
- suite->description = talloc_strdup(suite, "SMB2-FILEID-UNIQUE tests");
+ suite->description = talloc_strdup(suite, "SMB2-FILEID tests");
return suite;
}