Changeset 223 for branches/samba-3.3.x/source/lib/smbconf/testsuite.c

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/lib/smbconf/testsuite.c (modified) (15 diffs)

branches/samba-3.3.x/source/lib/smbconf/testsuite.c

@@ -42 +42 @@
         TALLOC_CTX *mem_ctx = talloc_stackframe();
 
-        printf("test: get_includes\n");
+        printf("TEST: get_includes\n");
         werr = smbconf_get_global_includes(ctx, mem_ctx,
                                            &num_includes, &includes);
         if (!W_ERROR_IS_OK(werr)) {
-                printf("failure: get_includes - %s\n", dos_errstr(werr));
+                printf("FAIL: get_includes - %s\n", dos_errstr(werr));
                 goto done;
         }
@@ -54 +54 @@
         print_strings("", num_includes, (const char **)includes);
 
-        printf("success: get_includes\n");
+        printf("OK: get_includes\n");
         ret = true;
 
 done:
-        TALLOC_FREE(mem_ctx);
+        talloc_free(mem_ctx);
         return ret;
 }
@@ -76 +76 @@
         TALLOC_CTX *mem_ctx = talloc_stackframe();
 
-        printf("test: set_get_includes\n");
+        printf("TEST: set_get_includes\n");
 
         werr = smbconf_set_global_includes(ctx, set_num_includes, set_includes);
         if (!W_ERROR_IS_OK(werr)) {
-                printf("failure: get_set_includes (setting includes) - %s\n",
+                printf("FAIL: get_set_includes (setting includes) - %s\n",
                        dos_errstr(werr));
                 goto done;
@@ -88 +88 @@
                                            &get_includes);
         if (!W_ERROR_IS_OK(werr)) {
-                printf("failure: get_set_includes (getting includes) - %s\n",
+                printf("FAIL: get_set_includes (getting includes) - %s\n",
                        dos_errstr(werr));
                 goto done;
@@ -94 +94 @@
 
         if (get_num_includes != set_num_includes) {
-                printf("failure: get_set_includes - set %d includes, got %d\n",
+                printf("FAIL: get_set_includes - set %d includes, got %d\n",
                        set_num_includes, get_num_includes);
                 goto done;
@@ -106 +106 @@
                         print_strings("* ", get_num_includes,
                                       (const char **)get_includes);
-                        printf("failure: get_set_includes - data mismatch:\n");
+                        printf("FAIL: get_set_includes - data mismatch:\n");
                         goto done;
                 }
         }
 
-        printf("success: set_includes\n");
+        printf("OK: set_includes\n");
         ret = true;
 
 done:
-        TALLOC_FREE(mem_ctx);
+        talloc_free(mem_ctx);
         return ret;
 }
@@ -131 +131 @@
         TALLOC_CTX *mem_ctx = talloc_stackframe();
 
-        printf("test: delete_includes\n");
+        printf("TEST: delete_includes\n");
 
         werr = smbconf_set_global_includes(ctx, set_num_includes, set_includes);
         if (!W_ERROR_IS_OK(werr)) {
-                printf("failure: delete_includes (setting includes) - %s\n",
+                printf("FAIL: delete_includes (setting includes) - %s\n",
                        dos_errstr(werr));
                 goto done;
@@ -142 +142 @@
         werr = smbconf_delete_global_includes(ctx);
         if (!W_ERROR_IS_OK(werr)) {
-                printf("failure: delete_includes (deleting includes) - %s\n",
+                printf("FAIL: delete_includes (deleting includes) - %s\n",
                        dos_errstr(werr));
                 goto done;
@@ -150 +150 @@
                                            &get_includes);
         if (!W_ERROR_IS_OK(werr)) {
-                printf("failure: delete_includes (getting includes) - %s\n",
+                printf("FAIL: delete_includes (getting includes) - %s\n",
                        dos_errstr(werr));
                 goto done;
@@ -156 +156 @@
 
         if (get_num_includes != 0) {
-                printf("failure: delete_includes (not empty after delete)\n");
+                printf("FAIL: delete_includes (not empty after delete)\n");
                 goto done;
         }
@@ -162 +162 @@
         werr = smbconf_delete_global_includes(ctx);
         if (!W_ERROR_IS_OK(werr)) {
-                printf("failuer: delete_includes (delete empty includes) - "
+                printf("FAIL: delete_includes (delete empty includes) - "
                        "%s\n", dos_errstr(werr));
                 goto done;
         }
 
-        printf("success: delete_includes\n");
+        printf("OK: delete_includes\n");
         ret = true;
 
@@ -174 +174 @@
 }
 
+static bool create_conf_file(const char *filename)
+{
+        FILE *f;
+
+        printf("TEST: creating file\n");
+        f = sys_fopen(filename, "w");
+        if (!f) {
+                printf("failure: failed to open %s for writing: %s\n",
+                       filename, strerror(errno));
+                return false;
+        }
+
+        fprintf(f, "[global]\n");
+        fprintf(f, "\tserver string = smbconf testsuite\n");
+        fprintf(f, "\tworkgroup = SAMBA\n");
+        fprintf(f, "\tsecurity = user\n");
+
+        fclose(f);
+
+        printf("OK: create file\n");
+        return true;
+}
+
 static bool torture_smbconf_txt(void)
+{
+        WERROR werr;
+        bool ret = true;
+        const char *filename = "/tmp/smb.conf.smbconf_testsuite";
+        struct smbconf_ctx *conf_ctx = NULL;
+        TALLOC_CTX *mem_ctx = talloc_stackframe();
+
+        printf("test: text backend\n");
+
+        if (!create_conf_file(filename)) {
+                ret = false;
+                goto done;
+        }
+
+        printf("TEST: init\n");
+        werr = smbconf_init_txt(mem_ctx, &conf_ctx, filename);
+        if (!W_ERROR_IS_OK(werr)) {
+                printf("FAIL: text backend\[ failed: %s\n", dos_errstr(werr));
+                ret = false;
+                goto done;
+        }
+        printf("OK: init\n");
+
+        ret &= test_get_includes(conf_ctx);
+
+        smbconf_shutdown(conf_ctx);
+
+        printf("TEST: unlink file\n");
+        if (unlink(filename) != 0) {
+                printf("OK: unlink failed: %s\n", strerror(errno));
+                ret = false;
+                goto done;
+        }
+        printf("OK: unlink file\n");
+
+done:
+        printf("%s: text backend\n", ret ? "success" : "failure");
+        talloc_free(mem_ctx);
+        return ret;
+}
+
+static bool torture_smbconf_reg(void)
 {
         WERROR werr;
@@ -181 +246 @@
         TALLOC_CTX *mem_ctx = talloc_stackframe();
 
-        printf("test: text backend\n");
-
-        printf("test: init\n");
-        werr = smbconf_init_txt(mem_ctx, &conf_ctx, NULL);
-        if (!W_ERROR_IS_OK(werr)) {
-                printf("failure: init failed: %s\n", dos_errstr(werr));
+        printf("test: registry backend\n");
+
+        printf("TEST: init\n");
+        werr = smbconf_init_reg(mem_ctx, &conf_ctx, NULL);
+        if (!W_ERROR_IS_OK(werr)) {
+                printf("FAIL: init failed: %s\n", dos_errstr(werr));
                 ret = false;
                 goto done;
         }
-        printf("success: init\n");
-
-        ret &= test_get_includes(conf_ctx);
-
-        smbconf_shutdown(conf_ctx);
-
-        printf("%s: text backend\n", ret ? "success" : "failure");
-
-done:
-        TALLOC_FREE(mem_ctx);
-        return ret;
-}
-
-static bool torture_smbconf_reg(void)
-{
-        WERROR werr;
-        bool ret = true;
-        struct smbconf_ctx *conf_ctx = NULL;
-        TALLOC_CTX *mem_ctx = talloc_stackframe();
-
-        printf("test: registry backend\n");
-
-        printf("test: init\n");
-        werr = smbconf_init_reg(mem_ctx, &conf_ctx, NULL);
-        if (!W_ERROR_IS_OK(werr)) {
-                printf("failure: init failed: %s\n", dos_errstr(werr));
-                ret = false;
-                goto done;
-        }
-        printf("success: init\n");
+        printf("OK: init\n");
 
         ret &= test_get_includes(conf_ctx);
@@ -227 +263 @@
         smbconf_shutdown(conf_ctx);
 
+done:
         printf("%s: registry backend\n", ret ? "success" : "failure");
-
-done:
-        TALLOC_FREE(mem_ctx);
+        talloc_free(mem_ctx);
         return ret;
 }
@@ -279 +314 @@
 
 done:
-        TALLOC_FREE(mem_ctx);
+        talloc_free(mem_ctx);
         return ret ? 0 : -1;
 }