summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-03-16 12:48:47 +0100
committerStefan Metzmacher <metze@samba.org>2010-03-16 15:09:41 +0100
commit8c5df22ffa4bb57078f4678c60cbec6ac7ba5710 (patch)
tree8986520950bf79ecf74b6c1cc7869b26624a726e
parent7e859be26ac1ba1154eb5b39e0467ca48a66cbf4 (diff)
downloadsamba-8c5df22ffa4bb57078f4678c60cbec6ac7ba5710.tar.gz
samba-8c5df22ffa4bb57078f4678c60cbec6ac7ba5710.tar.bz2
samba-8c5df22ffa4bb57078f4678c60cbec6ac7ba5710.zip
Revert "Revert "s4-smbtorture: skip extended SetValue test against Samba (both dont survive).""
This reverts commit 508c218eb2f4bf8c45dc9d481576c87ed4fecbd3. This lets make test fail. Matthias: please make sure make test still passes when you change things like this...(maybe add something to knownfail or so) metze
-rw-r--r--source4/torture/rpc/winreg.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 6057abb1d3..651721cdbf 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -2035,8 +2035,9 @@ static bool test_SetValue_extended(struct dcerpc_pipe *p,
};
int t, l;
- if (torture_setting_bool(tctx, "samba3", false)) {
- torture_skip(tctx, "skipping extended SetValue test against Samba 3");
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
+ torture_skip(tctx, "skipping extended SetValue test against Samba");
}
torture_comment(tctx, "Testing SetValue (extended formats)\n");
@@ -2143,13 +2144,8 @@ 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");
- 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");
- }
- }
+ torture_assert(tctx, test_SetValue_extended(p, tctx, &newhandle),
+ "extended SetValue test failed");
}
if (created && !test_CloseKey(p, tctx, &newhandle))