From 45b7992428f646b8586974e1d86e3cdad869b059 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 19 Jun 2015 16:49:41 +1200 Subject: [PATCH] Allow winbind removal by matching delays to Samba3.pm When using winbindd with the ntvfs file server, the responses are faster than they were in the past. Therefore, set: posix:sharedelay = 100000 posix:writetimeupdatedelay = 500000 to the values used in Samba3.pm to allow the tests to pass against the NTVFS file server without the internal winbind. This allows the internal winbind to be removed. Andrew Bartlett Signed-off-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- selftest/target/Samba4.pm | 16 ++++++++-------- source4/selftest/tests.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 32114c3a5ec..6ee56b393c3 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -925,16 +925,16 @@ sub provision($$$$$$$$$$) [tmp] path = $ctx->{share} read only = no - posix:sharedelay = 10000 + posix:sharedelay = 100000 posix:oplocktimeout = 3 - posix:writetimeupdatedelay = 50000 + posix:writetimeupdatedelay = 500000 [xcopy_share] path = $ctx->{share} read only = no - posix:sharedelay = 10000 + posix:sharedelay = 100000 posix:oplocktimeout = 3 - posix:writetimeupdatedelay = 50000 + posix:writetimeupdatedelay = 500000 create mask = 777 force create mode = 777 @@ -949,16 +949,16 @@ sub provision($$$$$$$$$$) [test1] path = $ctx->{share}/test1 read only = no - posix:sharedelay = 10000 + posix:sharedelay = 100000 posix:oplocktimeout = 3 - posix:writetimeupdatedelay = 50000 + posix:writetimeupdatedelay = 500000 [test2] path = $ctx->{share}/test2 read only = no - posix:sharedelay = 10000 + posix:sharedelay = 100000 posix:oplocktimeout = 3 - posix:writetimeupdatedelay = 50000 + posix:writetimeupdatedelay = 500000 [cifs] path = $ctx->{share}/_ignore_cifs_ diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 070586d2e26..ff675ba50e3 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -232,7 +232,7 @@ for t in nbt_tests: plansmbtorture4testsuite(t, "ad_dc_ntvfs", "//$SERVER/_none_ -U\"$USERNAME%$PASSWORD\"") # Tests against the NTVFS POSIX backend -ntvfsargs = ["--option=torture:sharedelay=10000", "--option=torture:oplocktimeout=3", "--option=torture:writetimeupdatedelay=50000"] +ntvfsargs = ["--option=torture:sharedelay=100000", "--option=torture:oplocktimeout=3", "--option=torture:writetimeupdatedelay=500000"] smb2 = smbtorture4_testsuites("smb2.") #The QFILEINFO-IPC test needs to be on ipc$ -- 2.11.4.GIT