Add sanity check, prevent from provisioning if mapistoredb_init failed or wasn't...

Fix unittest for mapistoredb

diff --git a/mapiproxy/libmapistore/database/mapistoredb.c b/mapiproxy/libmapistore/database/mapistoredb.c
index fb703964f3d3cabf736ad5cc70e68d1672d7c7b3..74ab009cdf72b934ae94229265ea0128b25f06fe 100644 (file)
--- a/mapiproxy/libmapistore/database/mapistoredb.c
+++ b/mapiproxy/libmapistore/database/mapistoredb.c
@@ -498,6 +498,7 @@ enum MAPISTORE_ERROR mapistoredb_provision(struct mapistoredb_context *mdb_ctx)
 
        /* Sanity checks */
        MAPISTORE_RETVAL_IF(!mdb_ctx, MAPISTORE_ERR_NOT_INITIALIZED, NULL);
+       MAPISTORE_RETVAL_IF(!mdb_ctx->mstore_ctx, MAPISTORE_ERR_NOT_INITIALIZED, NULL);
 
        /* Step 1. Add database schema */
        if (write_ldif_string_to_store(mdb_ctx, MDB_INIT_LDIF_TMPL) == false) {

diff --git a/pyopenchange/unittest/unittest_mapistoredb.py b/pyopenchange/unittest/unittest_mapistoredb.py
index 951b7edfdf87d5006eeb538c8972a39507113e3c..09289b95c8ae279391f7abf101c94be5dc9a87de 100755 (executable)
--- a/pyopenchange/unittest/unittest_mapistoredb.py
+++ b/pyopenchange/unittest/unittest_mapistoredb.py
@@ -37,8 +37,10 @@ class TestMAPIStoreDB(unittest.TestCase):
        def setUp(self):
                self.username = "jkerihuel"
                self.working_directory = tempfile.mkdtemp(prefix="TestMAPIStoreDB")
-               self.MAPIStoreDB = mapistoredb.mapistoredb(self.working_directory)
+               self.MAPIStoreDB = mapistoredb.mapistoredb()
                self.assert_(self.MAPIStoreDB)
+               retval = self.MAPIStoreDB.initialize(self.working_directory)
+               self.assertEqual(retval, 0)
                retval = self.MAPIStoreDB.provision(netbiosname = "server", firstorg = "OpenChange Project", firstou = "OpenChange Development Unit")
                self.assertEqual(retval, 0)
                retval = self.MAPIStoreDB.provision_named_properties()