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>

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index ce176450a871553a8b7bd3dcb1cea390c8c81786..cedcf97e994fdbee3c7564fa5a2255d2495300cd 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -1371,7 +1371,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 bfdb41a3a38cf8a679e892da94b4aa93c803478c..84f0d009f3ff4af7dfba6f4ae5baed5582f2a786 100644 (file)
--- 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);