sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s4 torture: Split up the torture suite setup for RAW-SFILEINFO

Browse Source 
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.
This commit is contained in:
Tim Prouty 2009-11-24 16:25:02 -08:00
parent 56eca75671
commit ce9ac3a685
5 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/script/tests/test_posix_s3.sh
View File

@ -32,7 +32,7 @@ base="$base BASE-XCOPY BASE-SAMBA3ERROR"
raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
raw="$raw RAW-SFILEINFO-BASE RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH RAW-SFILEINFO-RENAME"
raw="$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK"
raw="$raw RAW-SAMBA3ROOTDIRFID"
@ -67,7 +67,7 @@ skipped="BASE-CHARSET BASE-TCONDEV"
skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT"
skipped="$skipped RAW-IOCTL"
skipped="$skipped RAW-QFILEINFO RAW-QFSINFO"
skipped="$skipped RAW-SFILEINFO"
skipped="$skipped RAW-SFILEINFO-BASE"
echo "WARNING: Skipping tests $skipped"

2
source4/selftest/test_w2k3_file.sh
View File

@ -27,7 +27,7 @@ tests="$tests BASE-DENY3 BASE-XCOPY BASE-OPEN BASE-DENYDOS"
tests="$tests BASE-DELETE BASE-PROPERTIES BASE-MANGLE"
tests="$tests BASE-CHKPATH BASE-SECLEAK BASE-TRANS2"
tests="$tests BASE-NTDENY1 BASE-NTDENY2 BASE-RENAME BASE-OPENATTR"
tests="$tests RAW-QFILEINFO RAW-SFILEINFO-BUG RAW-SFILEINFO"
tests="$tests RAW-QFILEINFO RAW-SFILEINFO-BUG RAW-SFILEINFO-BASE"
tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-CONTEXT RAW-MUX RAW-OPEN RAW-WRITE"
tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-CHKPATH RAW-RENAME"
tests="$tests RAW-EAS RAW-STREAMS RAW-OPLOCK RAW-NOTIFY BASE-DELAYWRITE"

2
source4/selftest/win/wintest_raw.sh
View File

@ -22,7 +22,7 @@ shift 4
export SMBTORTURE_REMOTE_HOST=$server
raw_tests="RAW-QFILEINFO RAW-SFILEINFO RAW-MKDIR RAW-SEEK RAW-OPEN RAW-WRITE RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-RENAME RAW-EAS RAW-STREAMS"
raw_tests="RAW-QFILEINFO RAW-SFILEINFO-BASE RAW-MKDIR RAW-SEEK RAW-OPEN RAW-WRITE RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-RENAME RAW-EAS RAW-STREAMS"
# This test fails: RAW-QFSINFO
all_errs=0

5
source4/torture/raw/raw.c
View File

@ -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);

26
source4/torture/raw/setfileinfo.c
View File

@ -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;
}