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/registry.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/registry.c')
-rw-r--r-- | source4/torture/local/registry.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/source4/torture/local/registry.c b/source4/torture/local/registry.c index 0e72c11aeb..d200ba6e1b 100644 --- a/source4/torture/local/registry.c +++ b/source4/torture/local/registry.c @@ -36,50 +36,51 @@ const static struct test_backend_settings { { NULL, NULL } }; -static BOOL test_hive(struct torture_context *ctx, const void *_backend) +static bool test_hive(struct torture_context *tctx, + const void *test_data) { WERROR error; struct registry_key *root, *subkey; uint32_t count; - const struct test_backend_settings *backend = _backend; + const struct test_backend_settings *backend = test_data; + TALLOC_CTX *mem_ctx = tctx; if (!reg_has_backend(backend->name)) { - torture_skip(ctx, "Backend '%s' support not compiled in", - backend->name); - return True; + torture_skip(tctx, talloc_asprintf(tctx, + "Backend '%s' support not compiled in", backend->name)); } - error = reg_open_hive(ctx, backend->name, + error = reg_open_hive(mem_ctx, backend->name, backend->location, NULL, cmdline_credentials, &root); - torture_assert_werr_ok(ctx, error, "reg_open_hive()"); + torture_assert_werr_ok(tctx, error, "reg_open_hive()"); /* This is a new backend. There should be no subkeys and no * values */ error = reg_key_num_subkeys(root, &count); - torture_assert_werr_ok(ctx, error, "reg_key_num_subkeys()"); + torture_assert_werr_ok(tctx, error, "reg_key_num_subkeys()"); - torture_assert(ctx, count != 0, "New key has non-zero subkey count"); + torture_assert(tctx, count != 0, "New key has non-zero subkey count"); error = reg_key_num_values(root, &count); - torture_assert_werr_ok(ctx, error, "reg_key_num_values"); + torture_assert_werr_ok(tctx, error, "reg_key_num_values"); - torture_assert(ctx, count != 0, "New key has non-zero value count"); + torture_assert(tctx, count != 0, "New key has non-zero value count"); - error = reg_key_add_name(ctx, root, "Nested\\Key", SEC_MASK_GENERIC, NULL, &subkey); - torture_assert_werr_ok(ctx, error, "reg_key_add_name"); + error = reg_key_add_name(mem_ctx, root, "Nested\\Key", SEC_MASK_GENERIC, NULL, &subkey); + torture_assert_werr_ok(tctx, error, "reg_key_add_name"); error = reg_key_del(root, "Nested\\Key"); - torture_assert_werr_ok(ctx, error, "reg_key_del"); + torture_assert_werr_ok(tctx, error, "reg_key_del"); talloc_free(root); - - return True; + return true; } + struct torture_suite *torture_registry(TALLOC_CTX *mem_ctx) { struct torture_suite *suite = torture_suite_create(mem_ctx, - "LOCAL-REGISTRY"); + "REGISTRY"); int i; registry_init(); |