Changeset 740 for vendor/current/source4/param/tests

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/param/tests

Files:

• bindings.py (deleted)
• loadparm.c (modified) (14 diffs)
• share.c (modified) (2 diffs)

vendor/current/source4/param/tests/loadparm.c

@@ -33 +33 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "workgroup=werkgroep"), "lp_set_option failed");
-        torture_assert_str_equal(tctx, "WERKGROEP", lp_workgroup(lp_ctx), "workgroup");
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "workgroup=werkgroep"), "lpcfg_set_option failed");
+        torture_assert_str_equal(tctx, "WERKGROEP", lpcfg_workgroup(lp_ctx), "workgroup");
         return true;
 }
@@ -41 +41 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_cmdline(lp_ctx, "workgroup", "werkgroep"), "lp_set_cmdline failed");
-        torture_assert(tctx, lp_do_global_parameter(lp_ctx, "workgroup", "barbla"), "lp_set_option failed");
-        torture_assert_str_equal(tctx, "WERKGROEP", lp_workgroup(lp_ctx), "workgroup");
+        torture_assert(tctx, lpcfg_set_cmdline(lp_ctx, "workgroup", "werkgroep"), "lpcfg_set_cmdline failed");
+        torture_assert(tctx, lpcfg_do_global_parameter(lp_ctx, "workgroup", "barbla"), "lpcfg_set_option failed");
+        torture_assert_str_equal(tctx, "WERKGROEP", lpcfg_workgroup(lp_ctx), "workgroup");
         return true;
 }
@@ -50 +50 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_do_global_parameter(lp_ctx, "workgroup", "werkgroep42"), 
-                       "lp_set_cmdline failed");
-        torture_assert_str_equal(tctx, lp_workgroup(lp_ctx), "WERKGROEP42", "workgroup");
+        torture_assert(tctx, lpcfg_do_global_parameter(lp_ctx, "workgroup", "werkgroep42"),
+                       "lpcfg_set_cmdline failed");
+        torture_assert_str_equal(tctx, lpcfg_workgroup(lp_ctx), "WERKGROEP42", "workgroup");
         return true;
 }
@@ -60 +60 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_do_global_parameter_var(lp_ctx, "workgroup", "werk%s%d", "groep", 42), 
-                       "lp_set_cmdline failed");
-        torture_assert_str_equal(tctx, lp_workgroup(lp_ctx), "WERKGROEP42", "workgroup");
+        torture_assert(tctx, lpcfg_do_global_parameter_var(lp_ctx, "workgroup", "werk%s%d", "groep", 42),
+                       "lpcfg_set_cmdline failed");
+        torture_assert_str_equal(tctx, lpcfg_workgroup(lp_ctx), "WERKGROEP42", "workgroup");
         return true;
 }
@@ -70 +70 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, !lp_set_option(lp_ctx, "workgroup"), "lp_set_option succeeded");
+        torture_assert(tctx, !lpcfg_set_option(lp_ctx, "workgroup"), "lpcfg_set_option succeeded");
         return true;
 }
@@ -77 +77 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "some:thing=blaat"), "lp_set_option failed");
-        torture_assert_str_equal(tctx, lp_parm_string(lp_ctx, NULL, "some", "thing"), "blaat", 
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "some:thing=blaat"), "lpcfg_set_option failed");
+        torture_assert_str_equal(tctx, lpcfg_parm_string(lp_ctx, NULL, "some", "thing"), "blaat",
                                  "invalid parametric option");
         return true;
@@ -86 +86 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "some:thing=3.4"), "lp_set_option failed");
-        torture_assert(tctx, lp_parm_double(lp_ctx, NULL, "some", "thing", 2.0) == 3.4, 
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "some:thing=3.4"), "lpcfg_set_option failed");
+        torture_assert(tctx, lpcfg_parm_double(lp_ctx, NULL, "some", "thing", 2.0) == 3.4,
                                  "invalid parametric option");
-        torture_assert(tctx, lp_parm_double(lp_ctx, NULL, "some", "bla", 2.0) == 2.0, 
+        torture_assert(tctx, lpcfg_parm_double(lp_ctx, NULL, "some", "bla", 2.0) == 2.0,
                                  "invalid parametric option");
         return true;
@@ -97 +97 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "some:thing=true"), "lp_set_option failed");
-        torture_assert(tctx, lp_parm_bool(lp_ctx, NULL, "some", "thing", false) == true, 
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "some:thing=true"), "lpcfg_set_option failed");
+        torture_assert(tctx, lpcfg_parm_bool(lp_ctx, NULL, "some", "thing", false) == true,
                                  "invalid parametric option");
-        torture_assert(tctx, lp_parm_bool(lp_ctx, NULL, "some", "bla", true) == true, 
+        torture_assert(tctx, lpcfg_parm_bool(lp_ctx, NULL, "some", "bla", true) == true,
                                  "invalid parametric option");
         return true;
@@ -108 +108 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "some:thing=34"), "lp_set_option failed");
-        torture_assert_int_equal(tctx, lp_parm_int(lp_ctx, NULL, "some", "thing", 20), 34, 
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "some:thing=34"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_parm_int(lp_ctx, NULL, "some", "thing", 20), 34,
                                  "invalid parametric option");
-        torture_assert_int_equal(tctx, lp_parm_int(lp_ctx, NULL, "some", "bla", 42), 42, 
+        torture_assert_int_equal(tctx, lpcfg_parm_int(lp_ctx, NULL, "some", "bla", 42), 42,
                                  "invalid parametric option");
         return true;
@@ -119 +119 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "some:thing=16K"), "lp_set_option failed");
-        torture_assert_int_equal(tctx, lp_parm_bytes(lp_ctx, NULL, "some", "thing", 20), 16 * 1024, 
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "some:thing=16K"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_parm_bytes(lp_ctx, NULL, "some", "thing", 20), 16 * 1024,
                                  "invalid parametric option");
-        torture_assert_int_equal(tctx, lp_parm_bytes(lp_ctx, NULL, "some", "bla", 42), 42, 
+        torture_assert_int_equal(tctx, lpcfg_parm_bytes(lp_ctx, NULL, "some", "bla", 42), 42,
                                  "invalid parametric option");
         return true;
@@ -130 +130 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        struct loadparm_service *service = lp_add_service(lp_ctx, lp_default_service(lp_ctx), "foo");
-        torture_assert(tctx, lp_do_service_parameter(lp_ctx, service, 
-                                                     "some:thing", "foo"), "lp_set_option failed");
-        torture_assert_str_equal(tctx, lp_parm_string(lp_ctx, service, "some", "thing"), "foo",
+        struct loadparm_service *service = lpcfg_add_service(lp_ctx, lpcfg_default_service(lp_ctx), "foo");
+        torture_assert(tctx, lpcfg_do_service_parameter(lp_ctx, service,
+                                                     "some:thing", "foo"), "lpcfg_set_option failed");
+        torture_assert_str_equal(tctx, lpcfg_parm_string(lp_ctx, service, "some", "thing"), "foo",
                                  "invalid parametric option");
         return true;
@@ -141 +141 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        struct loadparm_service *service = lp_add_service(lp_ctx, lp_default_service(lp_ctx), "foo");
-        torture_assert(tctx, service == lp_service(lp_ctx, "foo"), "invalid service");
+        struct loadparm_service *service = lpcfg_add_service(lp_ctx, lpcfg_default_service(lp_ctx), "foo");
+        torture_assert(tctx, service == lpcfg_service(lp_ctx, "foo"), "invalid service");
         return true;
 }
@@ -148 +148 @@
 struct torture_suite *torture_local_loadparm(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "LOADPARM");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "loadparm");
 
         torture_suite_add_simple_test(suite, "create", test_create);
@@ -160 +160 @@
         torture_suite_add_simple_test(suite, "set_lp_parm_bytes", test_lp_parm_bytes);
         torture_suite_add_simple_test(suite, "service_parameter", test_lp_do_service_parameter);
-        torture_suite_add_simple_test(suite, "lp_service", test_lp_service);
+        torture_suite_add_simple_test(suite, "lpcfg_service", test_lp_service);
         torture_suite_add_simple_test(suite, "do_global_parameter_var", test_do_global_parameter_var);
         torture_suite_add_simple_test(suite, "do_global_parameter", test_do_global_parameter);

vendor/current/source4/param/tests/share.c

@@ -107 +107 @@
         NTSTATUS status;
 
-        status = share_remove(ctx, "nonexistant");
+        status = share_remove(ctx, "nonexistent");
 
         if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
@@ -199 +199 @@
 struct torture_suite *torture_local_share(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "SHARE");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "share");
         struct torture_tcase *tcase;