From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 21 Mar 2018 23:02:16 +0000 (+1300)
Subject: selftest: Do not run raw.notify, smb2.oplock and raw.oplock twice
X-Git-Tag: talloc-2.1.13~209
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5509fdea19552ec4c08f2cebe8e72f316dacd3be;p=thirdparty%2Fsamba.git

selftest: Do not run raw.notify, smb2.oplock and raw.oplock twice

These are slower tests that do not need to be run against the ad_dc configuration
in particular.

This saves time in the ad_dc job which needs to stay under 50mins to
pass on travis-ci (and faster tests are better for everyone anyway).

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
---

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 00e04318c7c..a4ded32195b 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -517,7 +517,8 @@ for t in tests:
             plansmbtorture4testsuite(t, env, '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     elif t == "smb2.change_notify_disabled":
         plansmbtorture4testsuite(t, "simpleserver", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
-    elif t == "smb2.notify":
+    elif t == "smb2.notify" or t == "raw.notify" or t == "smb2.oplock" or t == "raw.oplock":
+        # These tests are a little slower so don't duplicate them with ad_dc
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --signing=required')
     elif t == "smb2.dosmode":
         plansmbtorture4testsuite(t, "simpleserver", '//$SERVER/dosmode -U$USERNAME%$PASSWORD')