s4-smbtorture: Make test names lowercase and dot-separated.

[metze/samba/wip.git] / source4 / torture / local / torture.c

diff --git a/source4/torture/local/torture.c b/source4/torture/local/torture.c
index 9bd60d96201e717575439932eb0d678e79b2291f..0eb69a5db89eb2289bb9e8e1b44bf0f152f5726d 100644 (file)
--- a/source4/torture/local/torture.c
+++ b/source4/torture/local/torture.c
@@ -20,11 +20,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "system/wait.h"
-#include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "torture/util.h"
+#include "param/provision.h"
 
 static bool test_tempdir(struct torture_context *tctx)
 {
@@ -42,14 +41,14 @@ static bool test_tempdir(struct torture_context *tctx)
 static bool test_provision(struct torture_context *tctx)
 {
        NTSTATUS status;
-       struct provision_settings *settings = talloc(tctx, struct provision_settings);
+       struct provision_settings *settings = talloc_zero(tctx, struct provision_settings);
+       struct provision_result result;
        char *targetdir = NULL;
 
        torture_assert_ntstatus_ok(tctx, torture_temp_dir(tctx, "torture_provision", &targetdir), 
                                   "torture_temp_dir should return NT_STATUS_OK" );
        settings->targetdir = talloc_steal(settings, targetdir);
 
-       settings->dns_name = "example.com";
        settings->site_name = "SOME-SITE-NAME";
        settings->root_dn_str = "DC=EXAMPLE,DC=COM";
        settings->domain_dn_str = "DC=EXAMPLE,DC=COM";
@@ -59,21 +58,23 @@ static bool test_provision(struct torture_context *tctx)
        settings->netbios_name = "FOO";
        settings->realm = "EXAMPLE.COM";
        settings->domain = "EXAMPLE";
-       settings->ntds_guid = NULL;
+       settings->netbios_name = "torture";
        settings->ntds_dn_str = NULL;
        settings->machine_password = "geheim";
 
-       status = provision_bare(settings, tctx->lp_ctx, settings);
+       status = provision_bare(settings, tctx->lp_ctx, settings, &result);
                        
        torture_assert_ntstatus_ok(tctx, status, "provision");
 
+       torture_assert_str_equal(tctx, result.domaindn, "DC=EXAMPLE,DC=COM", 
+                                "domaindn incorrect");
+
        return true;
 }
 
 struct torture_suite *torture_local_torture(TALLOC_CTX *mem_ctx)
 {
-       struct torture_suite *suite = torture_suite_create(mem_ctx, 
-                                                                                                          "TORTURE");
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "torture");
 
        torture_suite_add_simple_test(suite, "tempdir", test_tempdir);
        torture_suite_add_simple_test(suite, "provision", test_provision);