diff options
| author | Andreas Schneider <asn@samba.org> | 2010-05-21 12:49:23 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2010-05-21 15:59:10 +0200 |
| commit | 74d0fc10fd646e493a98a00e524f17e9c4f3df3f (patch) | |
| tree | 15e2d75df1914f04d7e7034d63ebff56faf84f58 | |
| parent | 225bd02dab1a0656461d3d5e30ad03034e8c64f1 (diff) | |
| download | samba-74d0fc10fd646e493a98a00e524f17e9c4f3df3f.tar.gz samba-74d0fc10fd646e493a98a00e524f17e9c4f3df3f.tar.bz2 samba-74d0fc10fd646e493a98a00e524f17e9c4f3df3f.zip | |
s4-torture: Disable the security descriptor tests.
| -rw-r--r-- | source4/torture/rpc/winreg.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c index 89d003df4a..bbe72be7ca 100644 --- a/source4/torture/rpc/winreg.c +++ b/source4/torture/rpc/winreg.c @@ -2386,6 +2386,7 @@ static bool test_key_base(struct torture_context *tctx, bool created3 = false; const char *test_key1; const char *test_key3; + const char *test_subkey; test_Cleanup(b, tctx, handle, base_key); @@ -2459,9 +2460,11 @@ static bool test_key_base(struct torture_context *tctx, created3 = true; } + test_subkey = talloc_asprintf(tctx, "%s\\%s", test_key3, TEST_SUBKEY); + if (created3) { - if (test_CreateKey(b, tctx, handle, TEST_SUBKEY, NULL)) { - if (!test_DeleteKey(b, tctx, handle, TEST_SUBKEY)) { + if (test_CreateKey(b, tctx, handle, test_subkey, NULL)) { + if (!test_DeleteKey(b, tctx, handle, test_subkey)) { torture_comment(tctx, "DeleteKey failed\n"); ret = false; } @@ -2490,6 +2493,8 @@ static bool test_key_base_sd(struct torture_context *tctx, const char *test_key2; const char *test_key4; + torture_skip(tctx, "security descriptor test disabled\n"); + if (torture_setting_bool(tctx, "samba3", false) || torture_setting_bool(tctx, "samba4", false)) { torture_skip(tctx, "skipping security descriptor tests against Samba"); |