Changeset 740 for vendor/current/source4/lib/registry/tests/registry.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/lib/registry/tests/registry.c (modified) (5 diffs)

vendor/current/source4/lib/registry/tests/registry.c ¶

@@ -118 +118 @@
 {
         struct registry_context *rctx = (struct registry_context *)_data;
-        struct registry_key *root, *newkey1, *newkey2;
+        struct registry_key *root, *newkey;
         WERROR error;
 
@@ -125 +125 @@
                                "getting predefined key failed");
 
-        error = reg_key_add_name(rctx, root, "Hamburg", NULL, NULL,
-                                 &newkey1);
+        error = reg_key_add_name(rctx, root, "Hamburg\\Hamburg", NULL, NULL,
+                                 &newkey);
         torture_assert_werr_ok(tctx, error, "Creating key return code");
-        torture_assert(tctx, newkey1 != NULL, "Creating new key");
-
-        error = reg_key_add_name(rctx, root, "Hamburg\\Hamburg", NULL, NULL,
-                                 &newkey2);
-        torture_assert_werr_ok(tctx, error, "Creating key return code");
-        torture_assert(tctx, newkey2 != NULL, "Creating new key");
+        torture_assert(tctx, newkey != NULL, "Creating new key");
 
         return true;
@@ -201 +196 @@
         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");
@@ -465 +460 @@
         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");
 
@@ -585 +580 @@
 {
         struct torture_tcase *tcase;
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "REGISTRY");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "registry");
 
         tcase = torture_suite_add_tcase(suite, "local");