summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-03-06 22:02:25 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-06 22:02:25 +1100
commiteacf38cdb6c37d6fe979f2521a0baa1a66c6ddb5 (patch)
tree01a39755724bd682c37a7a92634a8a3c6e5f2cbe /source4/selftest
parent7e0ef3fd0ef4dba827f331cbe43fa0524be91130 (diff)
parent0e50fb5e917117de22c5b3c32865d8a40285e362 (diff)
downloadsamba-eacf38cdb6c37d6fe979f2521a0baa1a66c6ddb5.tar.gz
samba-eacf38cdb6c37d6fe979f2521a0baa1a66c6ddb5.tar.bz2
samba-eacf38cdb6c37d6fe979f2521a0baa1a66c6ddb5.zip
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 2232255ce384433ff9626f2fd3d399f758b0add5)
Diffstat (limited to 'source4/selftest')
-rwxr-xr-xsource4/selftest/samba4_tests.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index bea4173555..8102095958 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -217,7 +217,7 @@ done
plantest "rpc.echo on ncacn_np over smb2" dc $smb4torture ncacn_np:"\$SERVER[smb2]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*"
# Tests against the NTVFS POSIX backend
-NTVFSARGS="--option=torture:sharedelay=100000"
+NTVFSARGS="--option=torture:sharedelay=100000 --option=torture:oplocktimeout=3"
smb2=`$smb4torture --list | grep "^SMB2-" | xargs`
raw=`$smb4torture --list | grep "^RAW-" | xargs`
base=`$smb4torture --list | grep "^BASE-" | xargs`