diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-11-24 16:25:02 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-11-25 08:45:14 -0800 |
| commit | ce9ac3a685e2a23b30952bf20dbe3f9bf24dfaaa (patch) | |
| tree | 5c09b471b415816d899a1bdc94b546dd7137c9c1 /source4/torture/raw | |
| parent | 56eca756719fcec019588ccde6f9ae53cb94cff6 (diff) | |
| download | samba-ce9ac3a685e2a23b30952bf20dbe3f9bf24dfaaa.tar.gz samba-ce9ac3a685e2a23b30952bf20dbe3f9bf24dfaaa.tar.bz2 samba-ce9ac3a685e2a23b30952bf20dbe3f9bf24dfaaa.zip | |
s4 torture: Split up the torture suite setup for RAW-SFILEINFO
A side effect of this change is that RAW-SFILEINFO now runs the whole
suite instead of just the first test. I changed the name of the first
test to RAW-SFILEINFO-BASE and changed all of the selftest scripts
that call it.
Diffstat (limited to 'source4/torture/raw')
| -rw-r--r-- | source4/torture/raw/raw.c | 5 | ||||
| -rw-r--r-- | source4/torture/raw/setfileinfo.c | 26 |
2 files changed, 21 insertions, 10 deletions
diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index 138f263106..ada290f436 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -41,10 +41,7 @@ NTSTATUS torture_raw_init(void) 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_suite(suite, torture_raw_sfileinfo(suite)); 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); diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c index 31c753300c..d2163629d7 100644 --- a/source4/torture/raw/setfileinfo.c +++ b/source4/torture/raw/setfileinfo.c @@ -29,8 +29,8 @@ for each call we test that it succeeds, and where possible test for consistency between the calls. */ -bool torture_raw_sfileinfo(struct torture_context *torture, - struct smbcli_state *cli) +static bool +torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state *cli) { bool ret = true; int fnum = -1; @@ -442,8 +442,9 @@ done: /* * basic testing of all RAW_SFILEINFO_RENAME call */ -bool torture_raw_sfileinfo_rename(struct torture_context *torture, - struct smbcli_state *cli) +static bool +torture_raw_sfileinfo_rename(struct torture_context *torture, + struct smbcli_state *cli) { bool ret = true; int fnum_saved, d_fnum, fnum2, fnum = -1; @@ -669,8 +670,8 @@ done: /* look for the w2k3 setpathinfo STANDARD bug */ -bool torture_raw_sfileinfo_bug(struct torture_context *torture, - struct smbcli_state *cli) +static bool torture_raw_sfileinfo_bug(struct torture_context *torture, + struct smbcli_state *cli) { const char *fname = "\\bug3.txt"; union smb_setfileinfo sfinfo; @@ -698,3 +699,16 @@ bool torture_raw_sfileinfo_bug(struct torture_context *torture, return true; } + +struct torture_suite *torture_raw_sfileinfo(TALLOC_CTX *mem_ctx) +{ + struct torture_suite *suite = torture_suite_create(mem_ctx, + "SFILEINFO"); + + torture_suite_add_1smb_test(suite, "BASE", torture_raw_sfileinfo_base); + torture_suite_add_1smb_test(suite, "RENAME", + torture_raw_sfileinfo_rename); + torture_suite_add_1smb_test(suite, "BUG", torture_raw_sfileinfo_bug); + + return suite; +} |