s4-selftest: lower some of the timeouts during make test

This speeds up some of the delay based tests by a lot. There is no
need to have long delays during testing.

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 3c0c4f5152d636b8079b76aa48e494be9f7078c5..db2793e36bf2d6e7f0695f78bf90c1c59e10c28f 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -723,7 +723,7 @@ sub provision($$$$$$$)
 [tmp]
        path = $ctx->{tmpdir}
        read only = no
-       posix:sharedelay = 100000
+       posix:sharedelay = 10000
        posix:eadb = $ctx->{lockdir}/eadb.tdb
        posix:oplocktimeout = 3
        posix:writetimeupdatedelay = 500000
@@ -731,18 +731,18 @@ sub provision($$$$$$$)
 [test1]
        path = $ctx->{tmpdir}/test1
        read only = no
-       posix:sharedelay = 100000
+       posix:sharedelay = 10000
        posix:eadb = $ctx->{lockdir}/eadb.tdb
        posix:oplocktimeout = 3
-       posix:writetimeupdatedelay = 500000
+       posix:writetimeupdatedelay = 50000
 
 [test2]
        path = $ctx->{tmpdir}/test2
        read only = no
-       posix:sharedelay = 100000
+       posix:sharedelay = 10000
        posix:eadb = $ctx->{lockdir}/eadb.tdb
        posix:oplocktimeout = 3
-       posix:writetimeupdatedelay = 500000
+       posix:writetimeupdatedelay = 50000
 
 [cifs]
        read only = no

diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index e145ea0e3b30cba20ae67f4d4ee12aed11e9a200..753d4f3f8b8e1593730d9bc72c7e00dd737fed4c 100755 (executable)
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -280,9 +280,9 @@ plantest "ntp.signd" dc $smb4torture ncacn_np:"\$SERVER" -U"\$USERNAME"%"\$PASSW
 
 # Tests against the NTVFS POSIX backend
 NTVFSARGS=""
-NTVFSARGS="${NTVFSARGS} --option=torture:sharedelay=100000"
+NTVFSARGS="${NTVFSARGS} --option=torture:sharedelay=10000"
 NTVFSARGS="${NTVFSARGS} --option=torture:oplocktimeout=3"
-NTVFSARGS="${NTVFSARGS} --option=torture:writetimeupdatedelay=500000"
+NTVFSARGS="${NTVFSARGS} --option=torture:writetimeupdatedelay=50000"
 
 smb2=`$smb4torture --list | grep "^SMB2-" | xargs`
 #The QFILEINFO-IPC test needs to be on ipc$