summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-02-23 11:54:01 +0100
committerStefan Metzmacher <metze@samba.org>2008-02-26 09:33:01 +0100
commit9ddbdfa02cfaa0df6ce944d6dfecf6850ab0b2f8 (patch)
treebb0673a2a4696e4013080b856c88f6d2cf6b9e98
parentfa2e4ba03cd65f850d8f118ce61d5c4a80f0e30a (diff)
downloadsamba-9ddbdfa02cfaa0df6ce944d6dfecf6850ab0b2f8.tar.gz
samba-9ddbdfa02cfaa0df6ce944d6dfecf6850ab0b2f8.tar.bz2
samba-9ddbdfa02cfaa0df6ce944d6dfecf6850ab0b2f8.zip
selftest: Samba4 passes all oplocks tests now
The support for oplocks is not completely finished I believe we will not pass some non existing test. But it's a good start. metze (This used to be commit 278eea57fa9f59908672c935187f942e7780f0aa)
-rw-r--r--source4/samba4-knownfail1
-rw-r--r--source4/samba4-skip4
-rw-r--r--source4/selftest/target/Samba4.pm6
3 files changed, 6 insertions, 5 deletions
diff --git a/source4/samba4-knownfail b/source4/samba4-knownfail
index 18fb4b914b..4d850caae5 100644
--- a/source4/samba4-knownfail
+++ b/source4/samba4-knownfail
@@ -3,7 +3,6 @@ local.iconv.*.next_codepoint()
base.delaywrite.finfo update on close
base.delete.*.deltest20a
base.delete.*.deltest20b
-raw.oplock.*.OPLOCK
rpc.winreg
local.registry.*.security # Not implemented yet
rpc.wkssvc
diff --git a/source4/samba4-skip b/source4/samba4-skip
index 541738ecc4..4d2da6ed64 100644
--- a/source4/samba4-skip
+++ b/source4/samba4-skip
@@ -1,12 +1,10 @@
base.delaywrite
raw.composite
-raw.oplock
base.iometer
base.casetable
base.nttrans
.*base.bench.holdcon.* # Very slow
base.scan.maxfid
-raw.bench.oplock
raw.hold.oplock
raw.ping.pong
rpc.samr_accessmask
@@ -25,9 +23,7 @@ ntvfs.cifs.base.scan-maxfid
ntvfs.cifs.base.utable
ntvfs.cifs.base.smb
ntvfs.cifs.raw.composite
-ntvfs.cifs.raw.oplock
ntvfs.cifs.raw.notify
-ntvfs.cifs.raw.bench-oplock
ntvfs.cifs.raw.scan-eamax
ntvfs.cifs.raw.context
ntvfs.cifs.raw.qfileinfo.ipc
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 37e3cbe354..e0be8048a0 100644
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -562,12 +562,16 @@ sub provision($$$$$$)
gensec:require_pac = true
log level = $smbd_loglevel
+ # this is a global option
+ opendb:oplocks = yes
+
[tmp]
path = $tmpdir
read only = no
ntvfs handler = posix
posix:sharedelay = 100000
posix:eadb = $lockdir/eadb.tdb
+ posix:oplocktimeout = 3
[test1]
path = $tmpdir/test1
@@ -575,6 +579,7 @@ sub provision($$$$$$)
ntvfs handler = posix
posix:sharedelay = 100000
posix:eadb = $lockdir/eadb.tdb
+ posix:oplocktimeout = 3
[test2]
path = $tmpdir/test2
@@ -582,6 +587,7 @@ sub provision($$$$$$)
ntvfs handler = posix
posix:sharedelay = 100000
posix:eadb = $lockdir/eadb.tdb
+ posix:oplocktimeout = 3
[cifs]
read only = no