sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

CI: consolidate SMB2-FILEID and SMB2-FILEID-UNIQUE torture test suites

Browse Source 
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>
This commit is contained in:
Ralph Boehme 2022-03-28 12:38:58 +02:00 committed by Jeremy Allison
parent 24f4bea5b8
commit 8532d7b38c
4 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/selftest/tests.py
View File

@ -1009,8 +1009,6 @@ for t in tests:
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
elif t == "smb2.fileid":
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit_xattr -U$USERNAME%$PASSWORD')
elif t == "smb2.fileid_unique":
plansmbtorture4testsuite(t, "fileserver", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
elif t == "smb2.acls_non_canonical":
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/acls_non_canonical -U$USERNAME%$PASSWORD')
elif t == "smb2.async_dosmode":

1
source4/selftest/tests.py
View File

@ -377,7 +377,6 @@ smb2_s3only = [
"smb2.durable-v2-delay",
"smb2.aio_delay",
"smb2.fileid",
"smb2.fileid_unique",
"smb2.timestamps",
"smb2.async_dosmode",
"smb2.twrp",

24
source4/torture/smb2/create.c
View File

@ -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;
}

1
source4/torture/smb2/smb2.c
View File

@ -214,7 +214,6 @@ NTSTATUS torture_smb2_init(TALLOC_CTX *ctx)
torture_suite_add_1smb2_test(suite, "secleak", torture_smb2_sec_leak);
torture_suite_add_1smb2_test(suite, "session-id", run_sessidtest);
torture_suite_add_suite(suite, torture_smb2_deny_init(suite));
torture_suite_add_suite(suite, torture_smb2_fileid_unique_init(suite));
suite->description = talloc_strdup(suite, "SMB2-specific tests");