smbtorture: rename smb2.streams.attributes to smb2.streams.attributes1

A subsequent commit adds another streams test named "attributes2", this change
avoids matching the new testname with the existing knownfail entries.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15126
MR: https://gitlab.com/samba-team/samba/-/merge_requests/2643

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit b5848d391be4f7633745d9c36e432ac8b1c9dba2)

diff --git a/selftest/knownfail b/selftest/knownfail
index 4c5d03147d2c972b0ee0660dc2af0ce89f15c359..775267d5b92ff283b5d9ed47f565514c60dcf91b 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -207,10 +207,10 @@
 ^samba3.smb2.oplock.stream1
 ^samba3.smb2.streams.rename
 ^samba3.smb2.streams.rename2
-^samba3.smb2.streams.attributes
+^samba3.smb2.streams.attributes1\(.*\)
 ^samba3.smb2.streams streams_xattr.rename\(nt4_dc\)
 ^samba3.smb2.streams streams_xattr.rename2\(nt4_dc\)
-^samba3.smb2.streams streams_xattr.attributes\(nt4_dc\)
+^samba3.smb2.streams streams_xattr.attributes1\(nt4_dc\)
 ^samba3.smb2.getinfo.complex
 ^samba3.smb2.getinfo.fsinfo # quotas don't work yet
 ^samba3.smb2.setinfo.setinfo

diff --git a/source4/torture/smb2/streams.c b/source4/torture/smb2/streams.c
index c5ece0d9bcbc403e6ea2a7384a47a15b0f01edfe..889fa84ad5392fec82e20bccf5e82b192fb27bbe 100644 (file)
--- a/source4/torture/smb2/streams.c
+++ b/source4/torture/smb2/streams.c
@@ -1804,8 +1804,8 @@ static bool open_stream(struct smb2_tree *tree,
 
 
 /* Test the effect of setting attributes on a stream. */
-static bool test_stream_attributes(struct torture_context *tctx,
-                                  struct smb2_tree *tree)
+static bool test_stream_attributes1(struct torture_context *tctx,
+                                   struct smb2_tree *tree)
 {
        TALLOC_CTX *mem_ctx = talloc_new(tctx);
        bool ret = true;
@@ -2058,7 +2058,7 @@ struct torture_suite *torture_smb2_streams_init(TALLOC_CTX *ctx)
        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, "attributes1", test_stream_attributes1);
        torture_suite_add_1smb2_test(suite, "delete", test_stream_delete);
        torture_suite_add_1smb2_test(suite, "zero-byte", test_zero_byte_stream);
        torture_suite_add_1smb2_test(suite, "basefile-rename-with-open-stream",