s4/schema(tort): Refactor DSDB-SYNTAX test for better performance

Test was implemented as a test fixture so that setup/teardown
occurs only once.
This should impact test performace as long as provision_get_schema()
is a slow function (especially when debugging)

diff --git a/source4/dsdb/schema/tests/schema_syntax.c b/source4/dsdb/schema/tests/schema_syntax.c
index 2b3f1399285b3f07aa2fa7feff397f16c8970539..b631ddd0a88c5e771f50005ac5c81bda0ce0706d 100644 (file)
--- a/source4/dsdb/schema/tests/schema_syntax.c
+++ b/source4/dsdb/schema/tests/schema_syntax.c
@@ -32,6 +32,11 @@
 #include "param/provision.h"
 
 
+struct torture_dsdb_syntax {
+       struct ldb_context *ldb;
+       struct dsdb_schema *schema;
+};
+
 DATA_BLOB hexstr_to_data_blob(TALLOC_CTX *mem_ctx, const char *string) 
 {
        DATA_BLOB binary = data_blob_talloc(mem_ctx, NULL, strlen(string)/2);
@@ -79,9 +84,10 @@ static bool torture_syntax_add_OR_Name(struct torture_context *tctx,
        return true;
 };
 
-static bool torture_test_syntax(struct torture_context *torture, 
+static bool torture_test_syntax(struct torture_context *torture,
+                               struct torture_dsdb_syntax *priv,
                                const char *oid,
-                               const char *attr_string, 
+                               const char *attr_string,
                                const char *ldb_str,
                                const char *drs_str)
 {
@@ -90,21 +96,16 @@ static bool torture_test_syntax(struct torture_context *torture,
        DATA_BLOB ldb_blob = data_blob_string_const(ldb_str);
        struct drsuapi_DsReplicaAttribute drs, drs2;
        struct drsuapi_DsAttributeValue val;
-       struct dsdb_schema *schema;
        const struct dsdb_syntax *syntax;
        const struct dsdb_attribute *attr;
-       struct ldb_context *ldb;
        struct ldb_message_element el;
+       struct ldb_context *ldb = priv->ldb;
+       struct dsdb_schema *schema = priv->schema;
 
        drs.value_ctr.num_values = 1;
        drs.value_ctr.values = &val;
        val.blob = &drs_binary;
 
-       torture_assert(torture, ldb = provision_get_schema(tmp_ctx, torture->lp_ctx), "Failed to load schema from disk");
-       torture_assert(torture, schema = dsdb_get_schema(ldb), "Failed to fetch schema");
-       if (!torture_syntax_add_OR_Name(torture, ldb, schema)) {
-               return false;
-       }
        torture_assert(torture, syntax = find_syntax_map_by_standard_oid(oid), "Failed to find syntax handler");
        torture_assert(torture, attr = dsdb_attribute_by_lDAPDisplayName(schema, attr_string), "Failed to find attribute handler");
        torture_assert_str_equal(torture, attr->syntax->name, syntax->name, "Syntax from schema not as expected");
@@ -122,90 +123,140 @@ static bool torture_test_syntax(struct torture_context *torture,
        return true;
 }
 
-static bool torture_dsdb_drs_DN_BINARY(struct torture_context *torture) 
+static bool torture_dsdb_drs_DN_BINARY(struct torture_context *torture, struct torture_dsdb_syntax *priv)
 {
        bool ret;
        const char *ldb_str = "B:32:A9D1CA15768811D1ADED00C04FD8D5CD:<GUID=a8378c29-6319-45b3-b216-6a3108452d6c>;CN=Users,DC=ad,DC=ruth,DC=abartlet,DC=net";
        const char *drs_str = "8C00000000000000298C37A81963B345B2166A3108452D6C000000000000000000000000000000000000000000000000000000002900000043004E003D00550073006500720073002C00440043003D00610064002C00440043003D0072007500740068002C00440043003D00610062006100720074006C00650074002C00440043003D006E0065007400000014000000A9D1CA15768811D1ADED00C04FD8D5CD";
        const char *ldb_str2 = "B:8:00000002:<GUID=2b475208-3180-4ad4-b6bb-a26cfb44ac50>;<SID=S-1-5-21-3686369990-3108025515-1819299124>;DC=ad,DC=ruth,DC=abartlet,DC=net";
        const char *drs_str2 = "7A000000180000000852472B8031D44AB6BBA26CFB44AC50010400000000000515000000C68AB9DBABB440B9344D706C0000000020000000440043003D00610064002C00440043003D0072007500740068002C00440043003D00610062006100720074006C00650074002C00440043003D006E0065007400000000000800000000000002";
-       ret = torture_test_syntax(torture, DSDB_SYNTAX_BINARY_DN, "wellKnownObjects", ldb_str, drs_str);
+       ret = torture_test_syntax(torture, priv, DSDB_SYNTAX_BINARY_DN, "wellKnownObjects", ldb_str, drs_str);
        if (!ret) return false;
-       return torture_test_syntax(torture, DSDB_SYNTAX_BINARY_DN, "msDS-HasInstantiatedNCs", ldb_str2, drs_str2);
+       return torture_test_syntax(torture, priv, DSDB_SYNTAX_BINARY_DN, "msDS-HasInstantiatedNCs", ldb_str2, drs_str2);
 }
 
-static bool torture_dsdb_drs_DN(struct torture_context *torture) 
+static bool torture_dsdb_drs_DN(struct torture_context *torture, struct torture_dsdb_syntax *priv)
 {
        const char *ldb_str = "<GUID=fbee08fd-6f75-4bd4-af3f-e4f063a6379e>;OU=Domain Controllers,DC=ad,DC=naomi,DC=abartlet,DC=net";
        const char *drs_str = "A800000000000000FD08EEFB756FD44BAF3FE4F063A6379E00000000000000000000000000000000000000000000000000000000370000004F0055003D0044006F006D00610069006E00200043006F006E00740072006F006C006C006500720073002C00440043003D00610064002C00440043003D006E0061006F006D0069002C00440043003D00610062006100720074006C00650074002C00440043003D006E00650074000000";
-       if (!torture_test_syntax(torture, LDB_SYNTAX_DN, "lastKnownParent", ldb_str, drs_str)) {
+       if (!torture_test_syntax(torture, priv, LDB_SYNTAX_DN, "lastKnownParent", ldb_str, drs_str)) {
                return false;
        }
 
        /* extended_dn with GUID and SID in it */
        ldb_str = "<GUID=23cc7d16-3da0-4f3a-9921-0ad60a99230f>;<SID=S-1-5-21-3427639452-1671929926-2759570404-500>;CN=Administrator,CN=Users,DC=kma-exch,DC=devel";
        drs_str = "960000001C000000167DCC23A03D3A4F99210AD60A99230F0105000000000005150000009CA04DCC46A0A763E4B37BA4F40100002E00000043004E003D00410064006D0069006E006900730074007200610074006F0072002C0043004E003D00550073006500720073002C00440043003D006B006D0061002D0065007800630068002C00440043003D0064006500760065006C000000";
-       return torture_test_syntax(torture, LDB_SYNTAX_DN, "lastKnownParent", ldb_str, drs_str);
+       return torture_test_syntax(torture, priv, LDB_SYNTAX_DN, "lastKnownParent", ldb_str, drs_str);
 }
 
-static bool torture_dsdb_drs_OR_Name(struct torture_context *torture)
+static bool torture_dsdb_drs_OR_Name(struct torture_context *torture, struct torture_dsdb_syntax *priv)
 {
        const char *ldb_str = "<GUID=23cc7d16-3da0-4f3a-9921-0ad60a99230f>;<SID=S-1-5-21-3427639452-1671929926-2759570404-500>;CN=Administrator,CN=Users,DC=kma-exch,DC=devel";
        const char *drs_str = "960000001C000000167DCC23A03D3A4F99210AD60A99230F0105000000000005150000009CA04DCC46A0A763E4B37BA4F40100002E00000043004E003D00410064006D0069006E006900730074007200610074006F0072002C0043004E003D00550073006500720073002C00440043003D006B006D0061002D0065007800630068002C00440043003D0064006500760065006C000000000004000000";
-       return torture_test_syntax(torture, DSDB_SYNTAX_OR_NAME, "authOrig", ldb_str, drs_str);
+       return torture_test_syntax(torture, priv, DSDB_SYNTAX_OR_NAME, "authOrig", ldb_str, drs_str);
 }
 
-static bool torture_dsdb_drs_INT32(struct torture_context *torture) 
+static bool torture_dsdb_drs_INT32(struct torture_context *torture, struct torture_dsdb_syntax *priv)
 {
        const char *ldb_str = "532480";
        const char *drs_str = "00200800";
-       return torture_test_syntax(torture, LDB_SYNTAX_INTEGER, "userAccountControl", ldb_str, drs_str);
+       return torture_test_syntax(torture, priv, LDB_SYNTAX_INTEGER, "userAccountControl", ldb_str, drs_str);
 }
 
-static bool torture_dsdb_drs_INT64(struct torture_context *torture) 
+static bool torture_dsdb_drs_INT64(struct torture_context *torture, struct torture_dsdb_syntax *priv)
 {
        const char *ldb_str = "129022979538281250";
        const char *drs_str = "22E33D5FB761CA01";
-       return torture_test_syntax(torture, "1.2.840.113556.1.4.906", "pwdLastSet", ldb_str, drs_str);
+       return torture_test_syntax(torture, priv, "1.2.840.113556.1.4.906", "pwdLastSet", ldb_str, drs_str);
 }
 
-static bool torture_dsdb_drs_NTTIME(struct torture_context *torture) 
+static bool torture_dsdb_drs_NTTIME(struct torture_context *torture, struct torture_dsdb_syntax *priv)
 {
        const char *ldb_str = "20091109003446.0Z";
        const char *drs_str = "A6F4070103000000";
-       return torture_test_syntax(torture, "1.3.6.1.4.1.1466.115.121.1.24", "whenCreated", ldb_str, drs_str);
+       return torture_test_syntax(torture, priv, "1.3.6.1.4.1.1466.115.121.1.24", "whenCreated", ldb_str, drs_str);
 }
 
-static bool torture_dsdb_drs_BOOL(struct torture_context *torture) 
+static bool torture_dsdb_drs_BOOL(struct torture_context *torture, struct torture_dsdb_syntax *priv)
 {
        const char *ldb_str = "TRUE";
        const char *drs_str = "01000000";
-       return torture_test_syntax(torture, LDB_SYNTAX_BOOLEAN, "isDeleted", ldb_str, drs_str);
+       return torture_test_syntax(torture, priv, LDB_SYNTAX_BOOLEAN, "isDeleted", ldb_str, drs_str);
 }
 
-static bool torture_dsdb_drs_UNICODE(struct torture_context *torture) 
+static bool torture_dsdb_drs_UNICODE(struct torture_context *torture, struct torture_dsdb_syntax *priv)
 {
        const char *ldb_str = "primaryTelexNumber,Numéro de télex";
        const char *drs_str = "7000720069006D00610072007900540065006C00650078004E0075006D006200650072002C004E0075006D00E90072006F0020006400650020007400E9006C0065007800";
-       return torture_test_syntax(torture, LDB_SYNTAX_DIRECTORY_STRING, "attributeDisplayNames", ldb_str, drs_str);
+       return torture_test_syntax(torture, priv, LDB_SYNTAX_DIRECTORY_STRING, "attributeDisplayNames", ldb_str, drs_str);
+}
+
+/*
+ * DSDB-SYNTAX fixture setup/teardown handlers implementation
+ */
+static bool torture_dsdb_syntax_tcase_setup(struct torture_context *tctx, void **data)
+{
+       struct torture_dsdb_syntax *priv;
+
+       priv = talloc_zero(tctx, struct torture_dsdb_syntax);
+       torture_assert(tctx, priv, "No memory");
+
+       priv->ldb = provision_get_schema(priv, tctx->lp_ctx);
+       torture_assert(tctx, priv->ldb, "Failed to load schema from disk");
+
+       priv->schema = dsdb_get_schema(priv->ldb);
+       torture_assert(tctx, priv->schema, "Failed to fetch schema");
+
+       /* add 'authOrig' attribute with OR-Name syntax to schema */
+       if (!torture_syntax_add_OR_Name(tctx, priv->ldb, priv->schema)) {
+               return false;
+       }
+
+       *data = priv;
+       return true;
 }
 
+static bool torture_dsdb_syntax_tcase_teardown(struct torture_context *tctx, void *data)
+{
+       struct torture_dsdb_syntax *priv;
+
+       priv = talloc_get_type_abort(data, struct torture_dsdb_syntax);
+       talloc_free(priv);
+
+       return true;
+}
+
+/**
+ * DSDB-SYNTAX test suite creation
+ */
 struct torture_suite *torture_dsdb_syntax(TALLOC_CTX *mem_ctx)
 {
+       typedef bool (*pfn_run)(struct torture_context *, void *);
+
+       struct torture_tcase *tc;
        struct torture_suite *suite = torture_suite_create(mem_ctx, "DSDB-SYNTAX");
 
        if (suite == NULL) {
                return NULL;
        }
 
-       torture_suite_add_simple_test(suite, "DN-BINARY", torture_dsdb_drs_DN_BINARY);
-       torture_suite_add_simple_test(suite, "DN", torture_dsdb_drs_DN);
-       torture_suite_add_simple_test(suite, "OR-Name", torture_dsdb_drs_OR_Name);
-       torture_suite_add_simple_test(suite, "INT32", torture_dsdb_drs_INT32);
-       torture_suite_add_simple_test(suite, "INT64", torture_dsdb_drs_INT64);
-       torture_suite_add_simple_test(suite, "NTTIME", torture_dsdb_drs_NTTIME);
-       torture_suite_add_simple_test(suite, "BOOL", torture_dsdb_drs_BOOL);
-       torture_suite_add_simple_test(suite, "UNICODE", torture_dsdb_drs_UNICODE);
+       tc = torture_suite_add_tcase(suite, "tc");
+       if (!tc) {
+               return NULL;
+       }
+
+       torture_tcase_set_fixture(tc,
+                                 torture_dsdb_syntax_tcase_setup,
+                                 torture_dsdb_syntax_tcase_teardown);
+
+       torture_tcase_add_simple_test(tc, "DN-BINARY", (pfn_run)torture_dsdb_drs_DN_BINARY);
+       torture_tcase_add_simple_test(tc, "DN", (pfn_run)torture_dsdb_drs_DN);
+       torture_tcase_add_simple_test(tc, "OR-Name", (pfn_run)torture_dsdb_drs_OR_Name);
+       torture_tcase_add_simple_test(tc, "INT32", (pfn_run)torture_dsdb_drs_INT32);
+       torture_tcase_add_simple_test(tc, "INT64", (pfn_run)torture_dsdb_drs_INT64);
+       torture_tcase_add_simple_test(tc, "NTTIME", (pfn_run)torture_dsdb_drs_NTTIME);
+       torture_tcase_add_simple_test(tc, "BOOL", (pfn_run)torture_dsdb_drs_BOOL);
+       torture_tcase_add_simple_test(tc, "UNICODE", (pfn_run)torture_dsdb_drs_UNICODE);
 
        suite->description = talloc_strdup(suite, "DSDB syntax tests");