From 43170dafbcbe7464bce9b4c6d76532d7d0bf5b9a Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Mon, 22 Mar 2010 19:18:56 +0100 Subject: s4:registry - adaptions for "add memory contexts for delete value/key functions" --- source4/lib/registry/tests/hive.c | 14 +++++++------- source4/lib/registry/tests/registry.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source4/lib/registry/tests') diff --git a/source4/lib/registry/tests/hive.c b/source4/lib/registry/tests/hive.c index edc97c2468..c09051d27a 100644 --- a/source4/lib/registry/tests/hive.c +++ b/source4/lib/registry/tests/hive.c @@ -32,7 +32,7 @@ static bool test_del_nonexistant_key(struct torture_context *tctx, const void *test_data) { const struct hive_key *root = (const struct hive_key *)test_data; - WERROR error = hive_key_del(root, "bla"); + WERROR error = hive_key_del(tctx, root, "bla"); torture_assert_werr_equal(tctx, error, WERR_BADFILE, "invalid return code"); @@ -107,7 +107,7 @@ static bool test_add_subkey(struct torture_context *tctx, NULL, &subkey); torture_assert_werr_ok(tctx, error, "hive_key_add_name"); - error = hive_key_del(root, "Nested Key"); + error = hive_key_del(mem_ctx, root, "Nested Key"); torture_assert_werr_ok(tctx, error, "reg_key_del"); return true; @@ -140,7 +140,7 @@ static bool test_del_recursive(struct torture_context *tctx, torture_assert_werr_ok(tctx, error, "hive_key_set_value"); /* Deleting "Parent Key" will also delete "Child Key" and the value. */ - error = hive_key_del(root, "Parent Key"); + error = hive_key_del(mem_ctx, root, "Parent Key"); torture_assert_werr_ok(tctx, error, "hive_key_del"); return true; @@ -166,10 +166,10 @@ static bool test_del_key(struct torture_context *tctx, const void *test_data) NULL, &subkey); torture_assert_werr_ok(tctx, error, "hive_key_add_name"); - error = hive_key_del(root, "Nested Key"); + error = hive_key_del(mem_ctx, root, "Nested Key"); torture_assert_werr_ok(tctx, error, "reg_key_del"); - error = hive_key_del(root, "Nested Key"); + error = hive_key_del(mem_ctx, root, "Nested Key"); torture_assert_werr_equal(tctx, error, WERR_BADFILE, "reg_key_del"); return true; @@ -252,13 +252,13 @@ static bool test_del_value(struct torture_context *tctx, const void *test_data) data_blob_talloc(mem_ctx, data, sizeof(data))); torture_assert_werr_ok(tctx, error, "hive_key_set_value"); - error = hive_key_del_value(subkey, "Answer"); + error = hive_key_del_value(mem_ctx, subkey, "Answer"); torture_assert_werr_ok(tctx, error, "deleting value"); error = hive_get_value(mem_ctx, subkey, "Answer", &type, &value); torture_assert_werr_equal(tctx, error, WERR_BADFILE, "getting value"); - error = hive_key_del_value(subkey, "Answer"); + error = hive_key_del_value(mem_ctx, subkey, "Answer"); torture_assert_werr_equal(tctx, error, WERR_BADFILE, "deleting value"); diff --git a/source4/lib/registry/tests/registry.c b/source4/lib/registry/tests/registry.c index 7274bf009d..1bb20399a2 100644 --- a/source4/lib/registry/tests/registry.c +++ b/source4/lib/registry/tests/registry.c @@ -200,10 +200,10 @@ static bool test_del_key(struct torture_context *tctx, void *_data) torture_assert_werr_ok(tctx, error, "Creating key return code"); torture_assert(tctx, newkey != NULL, "Creating new key"); - error = reg_key_del(root, "Polen"); + error = reg_key_del(tctx, root, "Polen"); torture_assert_werr_ok(tctx, error, "Delete key"); - error = reg_key_del(root, "Polen"); + error = reg_key_del(tctx, root, "Polen"); torture_assert_werr_equal(tctx, error, WERR_BADFILE, "Delete missing key"); @@ -464,7 +464,7 @@ static bool test_del_value(struct torture_context *tctx, void *_data) data_blob_talloc(tctx, value, sizeof(value))); torture_assert_werr_ok (tctx, error, "setting value"); - error = reg_del_value(subkey, __FUNCTION__); + error = reg_del_value(tctx, subkey, __FUNCTION__); torture_assert_werr_ok (tctx, error, "unsetting value"); error = reg_key_get_value_by_name(tctx, subkey, __FUNCTION__, -- cgit