s3:selftest: add delay_inject:brl_lock_windows testing

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Mon Sep  9 15:42:45 UTC 2019 on sn-devel-184

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 1dfd543d6b51ef0d18aff35924d56bce37d834a0..7c9fdfc6889c613f7042f4d0ac49c34d0cfc6f1d 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -2272,6 +2272,18 @@ sub provision($$$$$$$$$)
        delay_inject:pread_send = 2000
        delay_inject:pwrite_send = 2000
 
+[brl_delay_inject1]
+       copy = tmp
+       vfs objects = delay_inject
+       delay_inject:brl_lock_windows = 90
+       delay_inject:brl_lock_windows_use_timer = yes
+
+[brl_delay_inject2]
+       copy = tmp
+       vfs objects = delay_inject
+       delay_inject:brl_lock_windows = 90
+       delay_inject:brl_lock_windows_use_timer = no
+
 [delete_readonly]
        path = $prefix_abs/share
        delete readonly = yes

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 420049da92555575e87612646193b0203c1e7dde..4e6b23f4c98611bfeea4b25f12c82d32705f1ff3 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -548,6 +548,10 @@ for t in tests:
             plansmbtorture4testsuite(t, env, '//$SERVER/tmp -k no -U$DC_USERNAME@$REALM%$DC_PASSWORD', description='ntlm user@realm')
     elif t == "raw.samba3posixtimedlock" or t == "smb2.samba3misc":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share')
+        plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/brl_delay_inject1 -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share',
+                                 description="brl_delay_inject1")
+        plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/brl_delay_inject2 -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share',
+                                 description="brl_delay_inject2")
         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/ad_dc/share')
     elif t == "raw.chkpath":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')