diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-16 13:06:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:12 -0500 |
| commit | 8773e743c518578584d07d35ffdafdd598af88b0 (patch) | |
| tree | 89726232dd6ae9eca1c219e21729a9b2336ddaa9 /source4/torture/smb2/smb2.c | |
| parent | 0f2347e417dec4a50f95d64353b260cd53a44a2b (diff) | |
| download | samba-8773e743c518578584d07d35ffdafdd598af88b0.tar.gz samba-8773e743c518578584d07d35ffdafdd598af88b0.tar.bz2 samba-8773e743c518578584d07d35ffdafdd598af88b0.zip | |
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)
Diffstat (limited to 'source4/torture/smb2/smb2.c')
| -rw-r--r-- | source4/torture/smb2/smb2.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c index cb0401b5d6..9399010afe 100644 --- a/source4/torture/smb2/smb2.c +++ b/source4/torture/smb2/smb2.c @@ -27,18 +27,24 @@ NTSTATUS torture_smb2_init(void) { - register_torture_op("SMB2-CONNECT", torture_smb2_connect); - register_torture_op("SMB2-SCAN", torture_smb2_scan); - register_torture_op("SMB2-SCANGETINFO", torture_smb2_getinfo_scan); - register_torture_op("SMB2-SCANSETINFO", torture_smb2_setinfo_scan); - register_torture_op("SMB2-SCANFIND", torture_smb2_find_scan); - register_torture_op("SMB2-GETINFO", torture_smb2_getinfo); - register_torture_op("SMB2-SETINFO", torture_smb2_setinfo); - register_torture_op("SMB2-FIND", torture_smb2_find); - register_torture_op("SMB2-LOCK", torture_smb2_lock); - register_torture_op("SMB2-NOTIFY", torture_smb2_notify); - register_torture_op("SMB2-MAXWRITE", torture_smb2_maxwrite); - register_torture_op("SMB2-DIR", torture_smb2_dir); + struct torture_suite *suite = torture_suite_create( + talloc_autofree_context(), + "SMB2"); + torture_suite_add_simple_test(suite, "CONNECT", torture_smb2_connect); + torture_suite_add_simple_test(suite, "SCAN", torture_smb2_scan); + torture_suite_add_simple_test(suite, "SCANGETINFO", torture_smb2_getinfo_scan); + torture_suite_add_simple_test(suite, "SCANSETINFO", torture_smb2_setinfo_scan); + torture_suite_add_simple_test(suite, "SCANFIND", torture_smb2_find_scan); + torture_suite_add_simple_test(suite, "GETINFO", torture_smb2_getinfo); + torture_suite_add_simple_test(suite, "SETINFO", torture_smb2_setinfo); + torture_suite_add_simple_test(suite, "FIND", torture_smb2_find); + torture_suite_add_simple_test(suite, "LOCK", torture_smb2_lock); + torture_suite_add_simple_test(suite, "NOTIFY", torture_smb2_notify); + + suite->description = talloc_strdup(suite, + "SMB2-specific tests"); + + torture_register_suite(suite); return NT_STATUS_OK; } |