summaryrefslogtreecommitdiff
path: root/source4/torture/smb2/smb2.c
diff options
context:
space:
mode:
authorSteven Danneman <steven.danneman@isilon.com>2009-07-30 15:10:50 -0700
committerSteven Danneman <steven.danneman@isilon.com>2009-10-01 14:59:52 -0700
commit1160d680620d71a7d5632b73c76d516f89696b65 (patch)
tree0d58d192517ce6cf359e1c038c9bf414ac1e782f /source4/torture/smb2/smb2.c
parent49fdeaeaf6eca052378b88cdf726f8eef753fe86 (diff)
downloadsamba-1160d680620d71a7d5632b73c76d516f89696b65.tar.gz
samba-1160d680620d71a7d5632b73c76d516f89696b65.tar.bz2
samba-1160d680620d71a7d5632b73c76d516f89696b65.zip
s4/torture: Ported SMB oplock torture tests to SMB2
I've ported all applicable SMB oplock torture tests to SMB2, giving us a good base for SMB2 oplock testing. There are several differences between oplocks in SMB and SMB2, mostly because of differences in W2K3 and W2K8. The existing SMB oplock tests all pass against W2K3, but several fail against W2K8. These same tests were failing in SMB2, util I reworked them. BATCH19, BATCH20: In W2K3/SMB a setfileinfo - rename command wouldn't cause a sharing violation or break an existing oplock. It appears that in W2K8/SMB2 a sharing violation is raised. BATCH22: In W2K3/SMB when a second opener was waiting the full timeout of an oplock break, it would receive NT_STATUS_SHARING_VIOLATION after about 35 seconds. This bug has been fixed in W2K8/SMB2 and instead the second opener succeeds. LEVELII500: Added 1 new test checking that the server returns a proper error code when a client improperly replies to a levelII to none break notification. STREAM1: W2K8 now grants oplocks on alternate data streams.
Diffstat (limited to 'source4/torture/smb2/smb2.c')
-rw-r--r--source4/torture/smb2/smb2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index 4a3ca1465d..2430b095b9 100644
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -139,10 +139,12 @@ NTSTATUS torture_smb2_init(void)
torture_suite_add_suite(suite, torture_smb2_create_init());
torture_suite_add_simple_test(suite, "NOTIFY", torture_smb2_notify);
torture_suite_add_suite(suite, torture_smb2_durable_open_init());
- torture_suite_add_1smb2_test(suite, "OPLOCK-BATCH1", torture_smb2_oplock_batch1);
torture_suite_add_suite(suite, torture_smb2_dir_init());
torture_suite_add_suite(suite, torture_smb2_lease_init());
torture_suite_add_suite(suite, torture_smb2_compound_init());
+ torture_suite_add_suite(suite, torture_smb2_oplocks_init());
+ torture_suite_add_1smb2_test(suite, "BENCH-OPLOCK", test_smb2_bench_oplock);
+ torture_suite_add_1smb2_test(suite, "HOLD-OPLOCK", test_smb2_hold_oplock);
suite->description = talloc_strdup(suite, "SMB2-specific tests");