From: Ralph Boehme <slow@samba.org>
Date: Mon, 26 May 2025 09:18:57 +0000 (+0200)
Subject: selftest: stop running smb2.streams against "ad_dc" environment
X-Git-Tag: samba-4.22.2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44811da2e66272412967886623762008036c4690;p=thirdparty%2Fsamba.git

selftest: stop running smb2.streams against "ad_dc" environment

Drop running smb2.streams tests against the "ad_dc" environment, to simplify
test failure handling with the knownfail file.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15861

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Bjoern Jacke <bjacke@samba.org>
(cherry picked from commit 8c0888a94bbcd55b5746305ab82c9ce50095db32)
---

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 437a4a8ee13..3768b919c3e 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -1363,7 +1363,6 @@ for t in tests:
         plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD --option=torture:wksname=samba3rpctest')
     elif t == "smb2.streams":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
-        plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/streams_xattr -U$USERNAME%$PASSWORD', 'streams_xattr')
     elif t == "smb2.stream-inherit-perms":
         plansmbtorture4testsuite(t, "fileserver", '//$SERVER/inherit_perms -U$USERNAME%$PASSWORD')
diff --git a/source4/torture/smb2/streams.c b/source4/torture/smb2/streams.c
index bfdb41a3a38..84f0d009f3f 100644
--- a/source4/torture/smb2/streams.c
+++ b/source4/torture/smb2/streams.c
@@ -1522,17 +1522,15 @@ static bool test_stream_rename2(struct torture_context *tctx,
 	status = smb2_setinfo_file(tree, &sinfo);
 	CHECK_STATUS(status, NT_STATUS_SHARING_VIOLATION);
 
-	if (!torture_setting_bool(tctx, "samba4", false)) {
-		/*
-		 * Check SMB2 rename to the default stream using :<stream>.
-		 */
-		torture_comment(tctx, "(%s) Checking SMB2 rename to default stream "
-				"using :<stream>\n", __location__);
-		sinfo.rename_information.in.file.handle = h1;
-		sinfo.rename_information.in.new_name = stream_name_default;
-		status = smb2_setinfo_file(tree, &sinfo);
-		CHECK_STATUS(status, NT_STATUS_OK);
-	}
+	/*
+	 * Check SMB2 rename to the default stream using :<stream>.
+	 */
+	torture_comment(tctx, "(%s) Checking SMB2 rename to default stream "
+			"using :<stream>\n", __location__);
+	sinfo.rename_information.in.file.handle = h1;
+	sinfo.rename_information.in.new_name = stream_name_default;
+	status = smb2_setinfo_file(tree, &sinfo);
+	CHECK_STATUS(status, NT_STATUS_OK);
 
 	smb2_util_close(tree, h1);