summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2019-08-20 15:53:59 +0200
committerStefan Metzmacher <metze@samba.org>2019-09-09 17:19:11 +0000
commitbe42cfafee057993d038f7d476d094c53b00b57e (patch)
treeeeeede7a512711cb6b18c113aaeb96163b92ecff
parent9bf1c5c3e48ff905eec6f9ee469f1067b4105d42 (diff)
downloadsamba-be42cfafee057993d038f7d476d094c53b00b57e.tar.gz
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 (cherry picked from commit 2b43ce6704ecf035e6734337a2dea3458153a4b2) Autobuild-User(v4-11-test): Stefan Metzmacher <metze@samba.org> Autobuild-Date(v4-11-test): Mon Sep 9 17:19:11 UTC 2019 on sn-devel-184
-rwxr-xr-xselftest/target/Samba3.pm12
-rwxr-xr-xsource3/selftest/tests.py4
2 files changed, 16 insertions, 0 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 9638bb44f08..131d576a767 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -2263,6 +2263,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 ebc366de3ea..31cb8ca33f1 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -531,6 +531,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')