summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-10-23 15:38:54 +1100
committerAndrew Tridgell <tridge@samba.org>2009-10-23 15:38:54 +1100
commit0fca2b078ceb314e429e24e3318b50451ccf423b (patch)
tree3c40e44f943ff6db3af0a106773f48703de4087f
parent0b624d9effa950e1e7ba95866a37b84bb74be772 (diff)
downloadsamba-0fca2b078ceb314e429e24e3318b50451ccf423b.tar.gz
samba-0fca2b078ceb314e429e24e3318b50451ccf423b.tar.bz2
samba-0fca2b078ceb314e429e24e3318b50451ccf423b.zip
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.
-rw-r--r--selftest/target/Samba4.pm10
-rwxr-xr-xsource4/selftest/tests.sh4
2 files changed, 7 insertions, 7 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 3c0c4f5152..db2793e36b 100644
--- 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 e145ea0e3b..753d4f3f8b 100755
--- 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$