diff options
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/rpc/winreg.c | 14 |
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)) |