diff options
| author | David Disseldorp <ddiss@suse.de> | 2013-01-15 17:23:03 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-01-16 23:15:07 +0100 |
| commit | 3619b1a7b2b5a2bfe6fdb13ecb4650ae575ab3e8 (patch) | |
| tree | dd417f939b41cd6793f4f64f1848cff983260c48 | |
| parent | bc59ebf5231b44220598dfdf44c9a2cfcc538711 (diff) | |
| download | samba-3619b1a7b2b5a2bfe6fdb13ecb4650ae575ab3e8.tar.gz samba-3619b1a7b2b5a2bfe6fdb13ecb4650ae575ab3e8.tar.bz2 samba-3619b1a7b2b5a2bfe6fdb13ecb4650ae575ab3e8.zip | |
torture: skip FSCTL_SRV_ENUM_SNAPS test when not supported
If FSCTL_SRV_ENUM_SNAPS fails with NT_STATUS_NOT_SUPPORTED then skip the
test, this means we can run the full ioctl test suite as part of
autobuild.
Reviewed by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | selftest/skip | 1 | ||||
| -rw-r--r-- | source4/torture/smb2/ioctl.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/selftest/skip b/selftest/skip index 4101aa23c6..43866bb7c0 100644 --- a/selftest/skip +++ b/selftest/skip @@ -103,7 +103,6 @@ bench # don't run benchmarks in our selftest # we should build a samba4ktutil and use that instead ^samba4.blackbox.ktpass # this test isn't portable ... ^samba4.drs.repl_schema.python # flakey test -^samba4.smb2.ioctl # snapshots not supported by default ^samba4.drs.delete_object.python # flakey test ^samba4.rpc.unixinfo # This contains a server-side getpwuid call which hangs the server when nss_winbindd is in use ^samba.tests.dcerpc.unix # This contains a server-side getpwuid call which hangs the server when nss_winbindd is in use diff --git a/source4/torture/smb2/ioctl.c b/source4/torture/smb2/ioctl.c index fdca601836..8c949ef300 100644 --- a/source4/torture/smb2/ioctl.c +++ b/source4/torture/smb2/ioctl.c @@ -59,6 +59,12 @@ static bool test_ioctl_get_shadow_copy(struct torture_context *torture, ioctl.smb2.in.flags = SMB2_IOCTL_FLAG_IS_FSCTL; status = smb2_ioctl(tree, tmp_ctx, &ioctl.smb2); + if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED) + || NT_STATUS_EQUAL(status, NT_STATUS_INVALID_DEVICE_REQUEST)) { + torture_comment(torture, + "FSCTL_SRV_ENUM_SNAPS not supported, skipping\n"); + return true; + } torture_assert_ntstatus_ok(torture, status, "FSCTL_SRV_ENUM_SNAPS"); return true; |