From 6369f59f38a217de1099237f2d8a258dd5a70264 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Sat, 13 Aug 2022 17:04:50 +0200 Subject: [PATCH] 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 Reviewed-by: Stefan Metzmacher (cherry picked from commit b5848d391be4f7633745d9c36e432ac8b1c9dba2) --- selftest/knownfail | 4 ++-- source4/torture/smb2/streams.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/selftest/knownfail b/selftest/knownfail index cab556be477..92f98ba5dc9 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -206,10 +206,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 c5ece0d9bcb..889fa84ad53 100644 --- 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", -- 2.11.4.GIT