From 845df42a19bade71bf6985d006e8e54018c53bdf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 17 Jun 2006 02:20:39 +0000 Subject: r16333: Move more code out of the core smbtorture. It now no longer contains protocol-specific code. (This used to be commit 819d3b457648ffb7526a770e842badc17b6061fb) --- source4/torture/raw/raw.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 source4/torture/raw/raw.c (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c new file mode 100644 index 0000000000..0156925a73 --- /dev/null +++ b/source4/torture/raw/raw.c @@ -0,0 +1,59 @@ +/* + Unix SMB/CIFS implementation. + SMB torture tester + Copyright (C) Jelmer Vernooij 2006 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "includes.h" +#include "torture/torture.h" +#include "libcli/raw/libcliraw.h" +#include "torture/raw/proto.h" + +NTSTATUS torture_raw_init(void) +{ + /* RAW smb tests */ + + register_torture_op("BENCH-OPLOCK", torture_bench_oplock); + register_torture_op("RAW-QFSINFO", torture_raw_qfsinfo); + register_torture_op("RAW-QFILEINFO", torture_raw_qfileinfo); + register_torture_op("RAW-SFILEINFO", torture_raw_sfileinfo); + register_torture_op("RAW-SFILEINFO-BUG", torture_raw_sfileinfo_bug); + register_torture_op("RAW-SEARCH", torture_raw_search); + register_torture_op("RAW-CLOSE", torture_raw_close); + register_torture_op("RAW-OPEN", torture_raw_open); + register_torture_op("RAW-MKDIR", torture_raw_mkdir); + register_torture_op("RAW-OPLOCK", torture_raw_oplock); + register_torture_op("RAW-NOTIFY", torture_raw_notify); + register_torture_op("RAW-MUX", torture_raw_mux); + register_torture_op("RAW-IOCTL", torture_raw_ioctl); + register_torture_op("RAW-CHKPATH", torture_raw_chkpath); + register_torture_op("RAW-UNLINK", torture_raw_unlink); + register_torture_op("RAW-READ", torture_raw_read); + register_torture_op("RAW-WRITE", torture_raw_write); + register_torture_op("RAW-LOCK", torture_raw_lock); + register_torture_op("RAW-CONTEXT", torture_raw_context); + register_torture_op("RAW-RENAME", torture_raw_rename); + register_torture_op("RAW-SEEK", torture_raw_seek); + register_torture_op("RAW-EAS", torture_raw_eas); + register_torture_op("RAW-STREAMS", torture_raw_streams); + register_torture_op("RAW-ACLS", torture_raw_acls); + register_torture_op("RAW-COMPOSITE", torture_raw_composite); + register_torture_op("RAW-SAMBA3HIDE", torture_samba3_hide); + register_torture_op("SCAN-EAMAX", torture_max_eas); + + return NT_STATUS_OK; +} -- cgit From 414c47633d89d87011fda08c3c2b8dcbbfbcc2a8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 28 Jun 2006 22:09:03 +0000 Subject: r16657: Test Jerry's iTunes bug, along with some more error conditions Volker (This used to be commit 12aa900eb2ffde3711a30c7e063bfba95128e91d) --- source4/torture/raw/raw.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 0156925a73..feff72d4e8 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -53,6 +53,7 @@ NTSTATUS torture_raw_init(void) register_torture_op("RAW-ACLS", torture_raw_acls); register_torture_op("RAW-COMPOSITE", torture_raw_composite); register_torture_op("RAW-SAMBA3HIDE", torture_samba3_hide); + register_torture_op("RAW-SAMBA3CHECKFSP", torture_samba3_checkfsp); register_torture_op("SCAN-EAMAX", torture_max_eas); return NT_STATUS_OK; -- cgit From 5517249fadfced980db5eb47bf04ece5edcb6c53 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sun, 2 Jul 2006 21:05:19 +0000 Subject: r16761: Added additional NTSTATUS and DOS error test for "." This confirms a theory of mine... Added RAW-SAMBA3BADPATH to selectable options. Jeremy. (This used to be commit 4cd7a8ed621d6215202d4b60d183a013a221581b) --- source4/torture/raw/raw.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index feff72d4e8..e2fdf67ca0 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -54,6 +54,7 @@ NTSTATUS torture_raw_init(void) register_torture_op("RAW-COMPOSITE", torture_raw_composite); register_torture_op("RAW-SAMBA3HIDE", torture_samba3_hide); register_torture_op("RAW-SAMBA3CHECKFSP", torture_samba3_checkfsp); + register_torture_op("RAW-SAMBA3BADPATH", torture_samba3_badpath); register_torture_op("SCAN-EAMAX", torture_max_eas); return NT_STATUS_OK; -- cgit From 8773e743c518578584d07d35ffdafdd598af88b0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 16 Oct 2006 13:06:41 +0000 Subject: r19339: Merge my 4.0-unittest branch. This adds an API for more fine-grained output in the testsuite rather than just True or False for a set of tests. The aim is to use this for: * known failure lists (run all tests and detect tests that started working or started failing). This would allow us to get rid of the RPC-SAMBA3-* tests * nicer torture output * simplification of the testsuite system * compatibility with other unit testing systems * easier usage of smbtorture (being able to run one test and automatically set up the environment for that) This is still a work-in-progress; expect more updates over the next couple of days. (This used to be commit 0eb6097305776325c75081356309115f445a7218) --- source4/torture/raw/raw.c | 65 ++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 29 deletions(-) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index e2fdf67ca0..411430a565 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -25,37 +25,44 @@ NTSTATUS torture_raw_init(void) { + struct torture_suite *suite = torture_suite_create( + talloc_autofree_context(), + "RAW"); /* RAW smb tests */ + torture_suite_add_simple_test(suite, "BENCH-OPLOCK", torture_bench_oplock); + torture_suite_add_simple_test(suite, "QFSINFO", torture_raw_qfsinfo); + torture_suite_add_simple_test(suite, "QFILEINFO", torture_raw_qfileinfo); + torture_suite_add_simple_test(suite, "SFILEINFO", torture_raw_sfileinfo); + torture_suite_add_simple_test(suite, "SFILEINFO-BUG", torture_raw_sfileinfo_bug); + torture_suite_add_simple_test(suite, "SEARCH", torture_raw_search); + torture_suite_add_simple_test(suite, "CLOSE", torture_raw_close); + torture_suite_add_simple_test(suite, "OPEN", torture_raw_open); + torture_suite_add_simple_test(suite, "MKDIR", torture_raw_mkdir); + torture_suite_add_simple_test(suite, "OPLOCK", torture_raw_oplock); + torture_suite_add_simple_test(suite, "NOTIFY", torture_raw_notify); + torture_suite_add_simple_test(suite, "MUX", torture_raw_mux); + torture_suite_add_simple_test(suite, "IOCTL", torture_raw_ioctl); + torture_suite_add_simple_test(suite, "CHKPATH", torture_raw_chkpath); + torture_suite_add_simple_test(suite, "UNLINK", torture_raw_unlink); + torture_suite_add_simple_test(suite, "READ", torture_raw_read); + torture_suite_add_simple_test(suite, "WRITE", torture_raw_write); + torture_suite_add_simple_test(suite, "LOCK", torture_raw_lock); + torture_suite_add_simple_test(suite, "CONTEXT", torture_raw_context); + torture_suite_add_simple_test(suite, "RENAME", torture_raw_rename); + torture_suite_add_simple_test(suite, "SEEK", torture_raw_seek); + torture_suite_add_simple_test(suite, "EAS", torture_raw_eas); + torture_suite_add_simple_test(suite, "STREAMS", torture_raw_streams); + torture_suite_add_simple_test(suite, "ACLS", torture_raw_acls); + torture_suite_add_simple_test(suite, "COMPOSITE", torture_raw_composite); + torture_suite_add_simple_test(suite, "SAMBA3HIDE", torture_samba3_hide); + torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", torture_samba3_checkfsp); + torture_suite_add_simple_test(suite, "SAMBA3BADPATH", torture_samba3_badpath); + torture_suite_add_simple_test(suite, "SCAN-EAMAX", torture_max_eas); - register_torture_op("BENCH-OPLOCK", torture_bench_oplock); - register_torture_op("RAW-QFSINFO", torture_raw_qfsinfo); - register_torture_op("RAW-QFILEINFO", torture_raw_qfileinfo); - register_torture_op("RAW-SFILEINFO", torture_raw_sfileinfo); - register_torture_op("RAW-SFILEINFO-BUG", torture_raw_sfileinfo_bug); - register_torture_op("RAW-SEARCH", torture_raw_search); - register_torture_op("RAW-CLOSE", torture_raw_close); - register_torture_op("RAW-OPEN", torture_raw_open); - register_torture_op("RAW-MKDIR", torture_raw_mkdir); - register_torture_op("RAW-OPLOCK", torture_raw_oplock); - register_torture_op("RAW-NOTIFY", torture_raw_notify); - register_torture_op("RAW-MUX", torture_raw_mux); - register_torture_op("RAW-IOCTL", torture_raw_ioctl); - register_torture_op("RAW-CHKPATH", torture_raw_chkpath); - register_torture_op("RAW-UNLINK", torture_raw_unlink); - register_torture_op("RAW-READ", torture_raw_read); - register_torture_op("RAW-WRITE", torture_raw_write); - register_torture_op("RAW-LOCK", torture_raw_lock); - register_torture_op("RAW-CONTEXT", torture_raw_context); - register_torture_op("RAW-RENAME", torture_raw_rename); - register_torture_op("RAW-SEEK", torture_raw_seek); - register_torture_op("RAW-EAS", torture_raw_eas); - register_torture_op("RAW-STREAMS", torture_raw_streams); - register_torture_op("RAW-ACLS", torture_raw_acls); - register_torture_op("RAW-COMPOSITE", torture_raw_composite); - register_torture_op("RAW-SAMBA3HIDE", torture_samba3_hide); - register_torture_op("RAW-SAMBA3CHECKFSP", torture_samba3_checkfsp); - register_torture_op("RAW-SAMBA3BADPATH", torture_samba3_badpath); - register_torture_op("SCAN-EAMAX", torture_max_eas); + suite->description = talloc_strdup(suite, + "Tests for the raw SMB interface"); + + torture_register_suite(suite); return NT_STATUS_OK; } -- cgit From 9944a67508ee437f6fd38bb2ce77ce1f5cbfac50 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 9 Dec 2006 03:16:17 +0000 Subject: r20092: added a locking benchmark that should be good for benchmarking communitcation in a CIFS clustered server. It tries to keep the connections full by setting up the next lock as each lock is done. The locking pattern is similar to the local filesystem ping pong test in junkcode, forcing a communication between nodes on each request (This used to be commit d57b9fb29860bd03cfa970bcc52ef45d17775638) --- source4/torture/raw/raw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 411430a565..817105614e 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -26,10 +26,11 @@ NTSTATUS torture_raw_init(void) { struct torture_suite *suite = torture_suite_create( - talloc_autofree_context(), - "RAW"); + talloc_autofree_context(), + "RAW"); /* RAW smb tests */ torture_suite_add_simple_test(suite, "BENCH-OPLOCK", torture_bench_oplock); + torture_suite_add_simple_test(suite, "BENCH-LOCK", torture_bench_lock); torture_suite_add_simple_test(suite, "QFSINFO", torture_raw_qfsinfo); torture_suite_add_simple_test(suite, "QFILEINFO", torture_raw_qfileinfo); torture_suite_add_simple_test(suite, "SFILEINFO", torture_raw_sfileinfo); -- cgit From 9e1a690d2830fe0209424194399ae988d5498cef Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 5 Jan 2007 16:02:42 +0000 Subject: r20552: Little Samba3 test to force smb_close to return an error. Set delete on close, and then remove perms from the parent dir.... Volker (This used to be commit f24c5052576d4951738f83c3b238d2c251d4553b) --- source4/torture/raw/raw.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 817105614e..ee74d6b84b 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -56,6 +56,7 @@ NTSTATUS torture_raw_init(void) torture_suite_add_simple_test(suite, "ACLS", torture_raw_acls); torture_suite_add_simple_test(suite, "COMPOSITE", torture_raw_composite); torture_suite_add_simple_test(suite, "SAMBA3HIDE", torture_samba3_hide); + torture_suite_add_simple_test(suite, "SAMBA3CLOSEERR", torture_samba3_closeerr); torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", torture_samba3_checkfsp); torture_suite_add_simple_test(suite, "SAMBA3BADPATH", torture_samba3_badpath); torture_suite_add_simple_test(suite, "SCAN-EAMAX", torture_max_eas); -- cgit From 25b4ee7af84b25f11d1cee0e10146b61f8453901 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 5 Apr 2007 06:23:06 +0000 Subject: r22087: added a RAW-BENCH-OPEN test that can be used to stress out a clustered implementation of a opendb backend. Use it in combination with --unclist to tell smbtorture to connect to multiple nodes in the cluster (This used to be commit b4e38b1b8dbc3ce817f858f39c3f0521c9832fce) --- source4/torture/raw/raw.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index ee74d6b84b..eb89193f47 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -31,6 +31,7 @@ NTSTATUS torture_raw_init(void) /* RAW smb tests */ torture_suite_add_simple_test(suite, "BENCH-OPLOCK", torture_bench_oplock); torture_suite_add_simple_test(suite, "BENCH-LOCK", torture_bench_lock); + torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open); torture_suite_add_simple_test(suite, "QFSINFO", torture_raw_qfsinfo); torture_suite_add_simple_test(suite, "QFILEINFO", torture_raw_qfileinfo); torture_suite_add_simple_test(suite, "SFILEINFO", torture_raw_sfileinfo); -- cgit From 8861c4a68ed23af2388103f2ca793f6833b4b58b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 14 May 2007 05:53:26 +0000 Subject: r22838: Add in an explority test for what QFSINFO operations are valid on IPC$ It seems most opertaions are supported, but that the values are not consistant. I think these are very much hand-hacked stubs, which is what they will be on Samba4 too. I'll need to add some more 'don't fail for...' hacks before this passes against Win2k3. Andrew Bartlett (This used to be commit dcb858d0c716b23be6c5d36b4aa6f155582ada63) --- source4/torture/raw/raw.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index eb89193f47..bdf4072a62 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -34,6 +34,7 @@ NTSTATUS torture_raw_init(void) torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open); torture_suite_add_simple_test(suite, "QFSINFO", torture_raw_qfsinfo); torture_suite_add_simple_test(suite, "QFILEINFO", torture_raw_qfileinfo); + torture_suite_add_simple_test(suite, "QFILEINFO-IPC", torture_raw_qfileinfo_pipe); torture_suite_add_simple_test(suite, "SFILEINFO", torture_raw_sfileinfo); torture_suite_add_simple_test(suite, "SFILEINFO-BUG", torture_raw_sfileinfo_bug); torture_suite_add_simple_test(suite, "SEARCH", torture_raw_search); -- cgit From e3408e61607f19f275062164adfc45ae08623f9e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 25 May 2007 13:03:33 +0000 Subject: r23144: splitup RAW-OPLOCK into small units metze (This used to be commit 0cfe152cb143165b908ef023a06c4107efbdecb9) --- source4/torture/raw/raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index bdf4072a62..b84fea81a9 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -41,7 +41,7 @@ NTSTATUS torture_raw_init(void) torture_suite_add_simple_test(suite, "CLOSE", torture_raw_close); torture_suite_add_simple_test(suite, "OPEN", torture_raw_open); torture_suite_add_simple_test(suite, "MKDIR", torture_raw_mkdir); - torture_suite_add_simple_test(suite, "OPLOCK", torture_raw_oplock); + torture_suite_add_suite(suite, torture_raw_oplock()); torture_suite_add_simple_test(suite, "NOTIFY", torture_raw_notify); torture_suite_add_simple_test(suite, "MUX", torture_raw_mux); torture_suite_add_simple_test(suite, "IOCTL", torture_raw_ioctl); -- cgit From a7601c982938b3be47c35ac114348c0726141c35 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 14 Jun 2007 13:02:31 +0000 Subject: r23492: Also activate the split out test... (This used to be commit a3cb4bcae7a6eaac99e2cffbce4a8a7d7fcf1547) --- source4/torture/raw/raw.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index b84fea81a9..672430139c 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -37,6 +37,8 @@ NTSTATUS torture_raw_init(void) torture_suite_add_simple_test(suite, "QFILEINFO-IPC", torture_raw_qfileinfo_pipe); torture_suite_add_simple_test(suite, "SFILEINFO", torture_raw_sfileinfo); torture_suite_add_simple_test(suite, "SFILEINFO-BUG", torture_raw_sfileinfo_bug); + torture_suite_add_simple_test(suite, "SFILEINFO-RENAME", + torture_raw_sfileinfo_rename); torture_suite_add_simple_test(suite, "SEARCH", torture_raw_search); torture_suite_add_simple_test(suite, "CLOSE", torture_raw_close); torture_suite_add_simple_test(suite, "OPEN", torture_raw_open); -- cgit From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 02:07:03 +0000 Subject: r23792: convert Samba4 to GPLv3 There are still a few tidyups of old FSF addresses to come (in both s3 and s4). More commits soon. (This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa) --- source4/torture/raw/raw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 672430139c..55e9350144 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -5,7 +5,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see . */ #include "includes.h" -- cgit From 7e43f973c4e3c76369e690707055f233d15fa37d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 20 Aug 2007 05:24:19 +0000 Subject: r24569: Add two tests A subtest for rename to check if case-changing renames work A test that exposes the case insensitivity unix_convert bug (This used to be commit 786706322a920fd54585bec72d860ed112398f12) --- source4/torture/raw/raw.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 55e9350144..67d79ef78c 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -62,6 +62,8 @@ NTSTATUS torture_raw_init(void) torture_suite_add_simple_test(suite, "SAMBA3CLOSEERR", torture_samba3_closeerr); torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", torture_samba3_checkfsp); torture_suite_add_simple_test(suite, "SAMBA3BADPATH", torture_samba3_badpath); + torture_suite_add_simple_test(suite, "SAMBA3CASEINSENSITIVE", + torture_samba3_caseinsensitive); torture_suite_add_simple_test(suite, "SCAN-EAMAX", torture_max_eas); suite->description = talloc_strdup(suite, -- cgit From 919aa6b27e5fe49b70c814210aa026c19be66e8a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 28 Aug 2007 12:54:27 +0000 Subject: r24735: Use torture API in more places. (This used to be commit 1319d88c099496be29dd9214fa2492c81e848369) --- source4/torture/raw/raw.c | 53 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 67d79ef78c..85db92661b 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -21,6 +21,7 @@ #include "torture/torture.h" #include "libcli/raw/libcliraw.h" #include "torture/raw/proto.h" +#include "torture/util.h" NTSTATUS torture_raw_init(void) { @@ -31,33 +32,33 @@ NTSTATUS torture_raw_init(void) torture_suite_add_simple_test(suite, "BENCH-OPLOCK", torture_bench_oplock); torture_suite_add_simple_test(suite, "BENCH-LOCK", torture_bench_lock); torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open); - torture_suite_add_simple_test(suite, "QFSINFO", torture_raw_qfsinfo); - torture_suite_add_simple_test(suite, "QFILEINFO", torture_raw_qfileinfo); - torture_suite_add_simple_test(suite, "QFILEINFO-IPC", torture_raw_qfileinfo_pipe); - torture_suite_add_simple_test(suite, "SFILEINFO", torture_raw_sfileinfo); - torture_suite_add_simple_test(suite, "SFILEINFO-BUG", torture_raw_sfileinfo_bug); - torture_suite_add_simple_test(suite, "SFILEINFO-RENAME", + torture_suite_add_1smb_test(suite, "QFSINFO", torture_raw_qfsinfo); + torture_suite_add_1smb_test(suite, "QFILEINFO", torture_raw_qfileinfo); + torture_suite_add_1smb_test(suite, "QFILEINFO-IPC", torture_raw_qfileinfo_pipe); + torture_suite_add_1smb_test(suite, "SFILEINFO", torture_raw_sfileinfo); + torture_suite_add_1smb_test(suite, "SFILEINFO-BUG", torture_raw_sfileinfo_bug); + torture_suite_add_1smb_test(suite, "SFILEINFO-RENAME", torture_raw_sfileinfo_rename); - torture_suite_add_simple_test(suite, "SEARCH", torture_raw_search); - torture_suite_add_simple_test(suite, "CLOSE", torture_raw_close); - torture_suite_add_simple_test(suite, "OPEN", torture_raw_open); - torture_suite_add_simple_test(suite, "MKDIR", torture_raw_mkdir); - torture_suite_add_suite(suite, torture_raw_oplock()); - torture_suite_add_simple_test(suite, "NOTIFY", torture_raw_notify); - torture_suite_add_simple_test(suite, "MUX", torture_raw_mux); - torture_suite_add_simple_test(suite, "IOCTL", torture_raw_ioctl); - torture_suite_add_simple_test(suite, "CHKPATH", torture_raw_chkpath); - torture_suite_add_simple_test(suite, "UNLINK", torture_raw_unlink); - torture_suite_add_simple_test(suite, "READ", torture_raw_read); - torture_suite_add_simple_test(suite, "WRITE", torture_raw_write); - torture_suite_add_simple_test(suite, "LOCK", torture_raw_lock); - torture_suite_add_simple_test(suite, "CONTEXT", torture_raw_context); - torture_suite_add_simple_test(suite, "RENAME", torture_raw_rename); - torture_suite_add_simple_test(suite, "SEEK", torture_raw_seek); - torture_suite_add_simple_test(suite, "EAS", torture_raw_eas); - torture_suite_add_simple_test(suite, "STREAMS", torture_raw_streams); - torture_suite_add_simple_test(suite, "ACLS", torture_raw_acls); - torture_suite_add_simple_test(suite, "COMPOSITE", torture_raw_composite); + torture_suite_add_suite(suite, torture_raw_search(suite)); + torture_suite_add_1smb_test(suite, "CLOSE", torture_raw_close); + torture_suite_add_1smb_test(suite, "OPEN", torture_raw_open); + torture_suite_add_1smb_test(suite, "MKDIR", torture_raw_mkdir); + torture_suite_add_suite(suite, torture_raw_oplock(suite)); + torture_suite_add_2smb_test(suite, "NOTIFY", torture_raw_notify); + torture_suite_add_1smb_test(suite, "MUX", torture_raw_mux); + torture_suite_add_1smb_test(suite, "IOCTL", torture_raw_ioctl); + torture_suite_add_1smb_test(suite, "CHKPATH", torture_raw_chkpath); + torture_suite_add_suite(suite, torture_raw_unlink(suite)); + torture_suite_add_suite(suite, torture_raw_read(suite)); + torture_suite_add_suite(suite, torture_raw_write(suite)); + torture_suite_add_suite(suite, torture_raw_lock(suite)); + torture_suite_add_1smb_test(suite, "CONTEXT", torture_raw_context); + torture_suite_add_suite(suite, torture_raw_rename(suite)); + torture_suite_add_1smb_test(suite, "SEEK", torture_raw_seek); + torture_suite_add_1smb_test(suite, "EAS", torture_raw_eas); + torture_suite_add_1smb_test(suite, "STREAMS", torture_raw_streams); + torture_suite_add_1smb_test(suite, "ACLS", torture_raw_acls); + torture_suite_add_1smb_test(suite, "COMPOSITE", torture_raw_composite); torture_suite_add_simple_test(suite, "SAMBA3HIDE", torture_samba3_hide); torture_suite_add_simple_test(suite, "SAMBA3CLOSEERR", torture_samba3_closeerr); torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", torture_samba3_checkfsp); -- cgit From aaf7df0597da40701ec2c075f3168704d1805f9e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 29 Aug 2007 04:33:26 +0000 Subject: r24765: added a RAW-HOLD-OPLOCK test. This is a manual test, meant to be used to test the interaction of oplocks with local filesystem or NFS access. You start it, then manually access the 4 files via another mechanism (such as a shell) and see what oplock breaks you get (This used to be commit 4c3e4564260e55434a54a013051db609c92cabe8) --- source4/torture/raw/raw.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 85db92661b..d85f267035 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -44,6 +44,7 @@ NTSTATUS torture_raw_init(void) torture_suite_add_1smb_test(suite, "OPEN", torture_raw_open); torture_suite_add_1smb_test(suite, "MKDIR", torture_raw_mkdir); torture_suite_add_suite(suite, torture_raw_oplock(suite)); + torture_suite_add_1smb_test(suite, "HOLD-OPLOCK", torture_hold_oplock); torture_suite_add_2smb_test(suite, "NOTIFY", torture_raw_notify); torture_suite_add_1smb_test(suite, "MUX", torture_raw_mux); torture_suite_add_1smb_test(suite, "IOCTL", torture_raw_ioctl); -- cgit From c0641b47289f5d22efcd2dc73bb2fdd1e56d7167 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Wed, 29 Aug 2007 05:45:24 +0000 Subject: r24767: add a torture test that performs "ping-pong" that works the same way as ping-pong.c this is a manual test and only makes sense to be used in parallell with the real ping-pong.c tool (This used to be commit b58677fa745361eafe87c62b2988a7b6387b23e7) --- source4/torture/raw/raw.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index d85f267035..598241b178 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -30,6 +30,7 @@ NTSTATUS torture_raw_init(void) "RAW"); /* RAW smb tests */ torture_suite_add_simple_test(suite, "BENCH-OPLOCK", torture_bench_oplock); + torture_suite_add_simple_test(suite, "PING-PONG", torture_ping_pong); torture_suite_add_simple_test(suite, "BENCH-LOCK", torture_bench_lock); torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open); torture_suite_add_1smb_test(suite, "QFSINFO", torture_raw_qfsinfo); -- cgit From afe87d6cfc7e13005b1a5b8b8110e480410bb4a0 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 30 Aug 2007 09:51:33 +0000 Subject: r24798: RAW-SAMBA3POSIXTIMEDLOCK This adds the torture:localdir option, smbtorture expects the share to actually reside in this directory. This might open up more solid posix vs cifs tests. (This used to be commit b0a40dd277c343f5c77c851b26981ddd8166f6bb) --- source4/torture/raw/raw.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 598241b178..0c4a28e0d6 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -67,6 +67,8 @@ NTSTATUS torture_raw_init(void) torture_suite_add_simple_test(suite, "SAMBA3BADPATH", torture_samba3_badpath); torture_suite_add_simple_test(suite, "SAMBA3CASEINSENSITIVE", torture_samba3_caseinsensitive); + torture_suite_add_simple_test(suite, "SAMBA3POSIXTIMEDLOCK", + torture_samba3_posixtimedlock); torture_suite_add_simple_test(suite, "SCAN-EAMAX", torture_max_eas); suite->description = talloc_strdup(suite, -- cgit From ac2a7014837b1ce135e732fd7a9b950d9fbc1401 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 2 Sep 2007 02:07:55 +0000 Subject: r24882: Use the torture API in BASE-CHARSET. (This used to be commit 93910d92cd431add876e98a12712253bee8c52e7) --- source4/torture/raw/raw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 0c4a28e0d6..88299c44cd 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -71,8 +71,7 @@ NTSTATUS torture_raw_init(void) torture_samba3_posixtimedlock); torture_suite_add_simple_test(suite, "SCAN-EAMAX", torture_max_eas); - suite->description = talloc_strdup(suite, - "Tests for the raw SMB interface"); + suite->description = talloc_strdup(suite, "Tests for the raw SMB interface"); torture_register_suite(suite); -- cgit From 5f280af0125043bc3e7ebce34ad80a635ca4ce09 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 24 Sep 2007 19:48:10 +0000 Subject: r25310: Make sure we do not regress on r25309 (This used to be commit 4eb0ec51aae4d05ce7bace7ea6dce2511e9a670a) --- source4/torture/raw/raw.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 88299c44cd..112c34d299 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -63,6 +63,8 @@ NTSTATUS torture_raw_init(void) torture_suite_add_1smb_test(suite, "COMPOSITE", torture_raw_composite); torture_suite_add_simple_test(suite, "SAMBA3HIDE", torture_samba3_hide); torture_suite_add_simple_test(suite, "SAMBA3CLOSEERR", torture_samba3_closeerr); + torture_suite_add_simple_test(suite, "SAMBA3ROOTDIRFID", + torture_samba3_rootdirfid); torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", torture_samba3_checkfsp); torture_suite_add_simple_test(suite, "SAMBA3BADPATH", torture_samba3_badpath); torture_suite_add_simple_test(suite, "SAMBA3CASEINSENSITIVE", -- cgit From 4e4e7dbff8f248024ed9150ef2387a186cac61a6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 25 Jan 2008 15:00:11 +1100 Subject: added a offline file torture test BASE-OFFLINE (This used to be commit d4b26fb2a38aa5b0ed2b6083641b9d8306af8c58) --- source4/torture/raw/raw.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 112c34d299..bb3dde728f 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -33,6 +33,7 @@ NTSTATUS torture_raw_init(void) torture_suite_add_simple_test(suite, "PING-PONG", torture_ping_pong); torture_suite_add_simple_test(suite, "BENCH-LOCK", torture_bench_lock); torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open); + torture_suite_add_simple_test(suite, "OFFLINE", torture_test_offline); torture_suite_add_1smb_test(suite, "QFSINFO", torture_raw_qfsinfo); torture_suite_add_1smb_test(suite, "QFILEINFO", torture_raw_qfileinfo); torture_suite_add_1smb_test(suite, "QFILEINFO-IPC", torture_raw_qfileinfo_pipe); -- cgit From 8a3e3391fb82c2ee8ef67dbded753d6fad564827 Mon Sep 17 00:00:00 2001 From: James Peach Date: Mon, 21 Apr 2008 15:09:43 -0700 Subject: smbtorture: Add RAW-BENCH-LOOKUP micro-benchmark. This test samples the lookup rate for a non-existant filename in a directory, while varying the number of files in the directory. The lookup rate should continue to approximate the lookup rate for the empty directory case. (This used to be commit ca7e4d9166a7cb10495cf3ecd9c4e72103fbec30) --- source4/torture/raw/raw.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index bb3dde728f..262ed1384b 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -33,6 +33,8 @@ NTSTATUS torture_raw_init(void) torture_suite_add_simple_test(suite, "PING-PONG", torture_ping_pong); torture_suite_add_simple_test(suite, "BENCH-LOCK", torture_bench_lock); torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open); + torture_suite_add_simple_test(suite, "BENCH-LOOKUP", + torture_bench_lookup); torture_suite_add_simple_test(suite, "OFFLINE", torture_test_offline); torture_suite_add_1smb_test(suite, "QFSINFO", torture_raw_qfsinfo); torture_suite_add_1smb_test(suite, "QFILEINFO", torture_raw_qfileinfo); -- cgit From 1e973565b6c0cb738b25a2d9439d5acb441701f4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 27 Apr 2008 14:02:46 +0100 Subject: Move subunit infrastructure code into lib/torture. (This used to be commit 5b44d8121de7735d69e6238a1442aff034a8ebd3) --- source4/torture/raw/raw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 262ed1384b..c6133081b0 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -18,10 +18,10 @@ */ #include "includes.h" -#include "torture/torture.h" #include "libcli/raw/libcliraw.h" -#include "torture/raw/proto.h" #include "torture/util.h" +#include "torture/smbtorture.h" +#include "torture/raw/proto.h" NTSTATUS torture_raw_init(void) { -- cgit From 9a975a868e949e61cb011422363cd07b4ec0ce43 Mon Sep 17 00:00:00 2001 From: James Peach Date: Tue, 20 May 2008 10:54:45 -0700 Subject: smbtorture: Add RAW-BENCH-TCON benchmark. Add a simple test to benchmark the rate at which a server can accept new tree connections. You can tune the length of time to run the benchmark for and the number of parallel connections to make. (This used to be commit ea3f4b93057e85c4ea516cc77dd0f293016d520c) --- source4/torture/raw/raw.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/torture/raw/raw.c') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index c6133081b0..0a7fc3ebfd 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -35,6 +35,8 @@ NTSTATUS torture_raw_init(void) torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open); torture_suite_add_simple_test(suite, "BENCH-LOOKUP", torture_bench_lookup); + torture_suite_add_simple_test(suite, "BENCH-TCON", + torture_bench_treeconnect); torture_suite_add_simple_test(suite, "OFFLINE", torture_test_offline); torture_suite_add_1smb_test(suite, "QFSINFO", torture_raw_qfsinfo); torture_suite_add_1smb_test(suite, "QFILEINFO", torture_raw_qfileinfo); -- cgit