diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-16 13:06:41 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:12 -0500 |
commit | 8773e743c518578584d07d35ffdafdd598af88b0 (patch) | |
tree | 89726232dd6ae9eca1c219e21729a9b2336ddaa9 /source4/torture/local/sddl.c | |
parent | 0f2347e417dec4a50f95d64353b260cd53a44a2b (diff) | |
download | samba-8773e743c518578584d07d35ffdafdd598af88b0.tar.gz samba-8773e743c518578584d07d35ffdafdd598af88b0.tar.bz2 samba-8773e743c518578584d07d35ffdafdd598af88b0.zip |
r19339: Merge my 4.0-unittest branch. This adds an API for more fine-grained
output in the testsuite rather than just True or False for a
set of tests.
The aim is to use this for:
* known failure lists (run all tests and detect tests that
started working or started failing). This
would allow us to get rid of the RPC-SAMBA3-* tests
* nicer torture output
* simplification of the testsuite system
* compatibility with other unit testing systems
* easier usage of smbtorture (being able to run one test
and automatically set up the environment for that)
This is still a work-in-progress; expect more updates over the next couple of
days.
(This used to be commit 0eb6097305776325c75081356309115f445a7218)
Diffstat (limited to 'source4/torture/local/sddl.c')
-rw-r--r-- | source4/torture/local/sddl.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c index 2db1006380..1bc6457a67 100644 --- a/source4/torture/local/sddl.c +++ b/source4/torture/local/sddl.c @@ -29,37 +29,31 @@ /* test one SDDL example */ -static BOOL test_sddl(struct torture_context *mem_ctx, const void *_sddl) +static bool test_sddl(struct torture_context *tctx, + const void *test_data) { struct security_descriptor *sd, *sd2; struct dom_sid *domain; - const char *sddl = _sddl; + const char *sddl = test_data; const char *sddl2; + TALLOC_CTX *mem_ctx = tctx; domain = dom_sid_parse_talloc(mem_ctx, "S-1-2-3-4"); sd = sddl_decode(mem_ctx, sddl, domain); - if (sd == NULL) { - printf("Failed to decode '%s'\n", sddl); - return False; - } + torture_assert(tctx, sd != NULL, talloc_asprintf(tctx, + "Failed to decode '%s'\n", sddl)); sddl2 = sddl_encode(mem_ctx, sd, domain); - if (sddl2 == NULL) { - printf("Failed to re-encode '%s'\n", sddl); - return False; - } + torture_assert(tctx, sddl2 != NULL, talloc_asprintf(tctx, + "Failed to re-encode '%s'\n", sddl)); sd2 = sddl_decode(mem_ctx, sddl2, domain); - if (sd2 == NULL) { - printf("Failed to decode2 '%s'\n", sddl2); - return False; - } + torture_assert(tctx, sd2 != NULL, talloc_asprintf(tctx, + "Failed to decode2 '%s'\n", sddl2)); - if (!security_descriptor_equal(sd, sd2)) { - printf("Failed equality test for '%s'\n", sddl); - return False; - } + torture_assert(tctx, security_descriptor_equal(sd, sd2), + talloc_asprintf(tctx, "Failed equality test for '%s'\n", sddl)); #if 0 /* flags don't have a canonical order ... */ @@ -73,7 +67,7 @@ static BOOL test_sddl(struct torture_context *mem_ctx, const void *_sddl) } talloc_free(sd); talloc_free(domain); - return True; + return true; } static const char *examples[] = { @@ -99,7 +93,7 @@ static const char *examples[] = { /* test a set of example SDDL strings */ struct torture_suite *torture_local_sddl(TALLOC_CTX *mem_ctx) { - struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCAL-SDDL"); + struct torture_suite *suite = torture_suite_create(mem_ctx, "SDDL"); int i; for (i = 0; i < ARRAY_SIZE(examples); i++) { |