summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-03-13 13:37:18 +0100
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-03-14 18:46:23 +0100
commit508c218eb2f4bf8c45dc9d481576c87ed4fecbd3 (patch)
treecc711cdd7720e494373d64b7b4ca010e1842e228
parentbb1ac0c75c2f42dff972bae36b3814e5ad1142f9 (diff)
downloadsamba-508c218eb2f4bf8c45dc9d481576c87ed4fecbd3.tar.gz
samba-508c218eb2f4bf8c45dc9d481576c87ed4fecbd3.tar.bz2
samba-508c218eb2f4bf8c45dc9d481576c87ed4fecbd3.zip
Revert "s4-smbtorture: skip extended SetValue test against Samba (both dont survive)."
This reverts commit 40e2c04f8aba605e951810751222559ea0d32ebd. s4 should support now also the extended "SetValue" tests.
-rw-r--r--source4/torture/rpc/winreg.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 538def60d4..15d4535c1a 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -2043,9 +2043,8 @@ static bool test_SetValue_extended(struct dcerpc_pipe *p,
};
int t, l;
- if (torture_setting_bool(tctx, "samba3", false) ||
- torture_setting_bool(tctx, "samba4", false)) {
- torture_skip(tctx, "skipping extended SetValue test against Samba");
+ if (torture_setting_bool(tctx, "samba3", false)) {
+ torture_skip(tctx, "skipping extended SetValue test against Samba 3");
}
torture_comment(tctx, "Testing SetValue (extended formats)\n");
@@ -2152,8 +2151,13 @@ static bool test_Open(struct torture_context *tctx, struct dcerpc_pipe *p,
if (created) {
torture_assert(tctx, test_SetValue_simple(p, tctx, &newhandle),
"simple SetValue test failed");
- torture_assert(tctx, test_SetValue_extended(p, tctx, &newhandle),
- "extended SetValue test failed");
+ if (!test_SetValue_extended(p, tctx, &newhandle)) {
+ if (torture_setting_bool(tctx, "samba3", false)) {
+ torture_warning(tctx, "extended SetValue test failed");
+ } else {
+ torture_fail(tctx, "extended SetValue test failed");
+ }
+ }
}
if (created && !test_CloseKey(p, tctx, &newhandle))