diff options
| -rw-r--r-- | source4/torture/rpc/winreg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c index eb71305b8d..0f3e383a20 100644 --- a/source4/torture/rpc/winreg.c +++ b/source4/torture/rpc/winreg.c @@ -2043,6 +2043,11 @@ static bool test_SetValue_extended(struct dcerpc_pipe *p, const char *str = "abcdefghijklmnopqrstuvwxzy"; int t, s; + 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"); for (t=0; t < ARRAY_SIZE(types); t++) { @@ -2147,13 +2152,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)) |