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.

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 538def60d4ab86f42326dc66827b362da6a395b9..15d4535c1aa10f0d3230f4965f7d98403356262f 100644 (file)
--- 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))