fixup

Author: albu-diku

mig/shared/useradm.py

@@ -455,6 +455,20 @@ def verify_user_peers(configuration, db_path, client_id, user, now, verify_peer,
     return accepted_peer_list, effective_expire
 
 
+def _check_directories_unprovisioned(configuration, db_path):
+    user_db_home = os.path.dirname(db_path)
+    return not os.path.exists(db_path) and not os.path.exists(user_db_home)
+
+
+def _provision_directories(configuration):
+    for config_attr in ('user_db_home', 'user_home', 'user_settings', 'user_cache', 'mrsl_files_dir', 'resource_pending'):
+        try:
+            dir_to_create = getattr(configuration, config_attr)
+            os.mkdir(dir_to_create)
+        except FileExistsError:
+            pass
+
+
 def create_user_in_db(configuration, db_path, client_id, user, now, authorized,
                       reset_token, reset_auth_type, accepted_peer_list, force,
                       verbose, ask_renew, default_renew, do_lock,
@@ -476,10 +490,8 @@ def create_user_in_db(configuration, db_path, client_id, user, now, authorized,
             if oserr.errno != errno.ENOENT: # FileNotFoundError
                 raise
 
-            user_db_home = os.path.dirname(db_path)
-
-            if not os.path.exists(db_path) and not os.path.exists(user_db_home):
-                os.mkdir(user_db_home)
+            if _check_directories_unprovisioned(configuration, db_path=db_path):
+                _provision_directories(configuration)
                 retry_lock = True
             else:
                 raise Exception("Failed to lock user DB: '%s'" % db_path)

tests/test_mig_server_createuser.py

@@ -29,6 +29,7 @@
 
 from __future__ import print_function
 import os
+import shutil
 import sys
 
 from tests.support import MIG_BASE, TEST_OUTPUT_DIR, MigTestCase, testmain
@@ -38,11 +39,17 @@
 class TestBooleans(MigTestCase):
     def before_each(self):
         configuration = self.configuration
-        test_user_db_home = os.path.join(configuration.state_path, 'user_db_home')
-        try:
-            os.rmdir(test_user_db_home)
-        except:
-            pass
+        test_state_path = configuration.state_path
+
+        for state_dir in ('user_db_home', 'user_home', 'user_settings', 'user_cache', 'mrsl_files', 'resource_pending'):
+            stat_dir_path = os.path.join(test_state_path, state_dir)
+            try:
+                shutil.rmtree(stat_dir_path)
+            except:
+                pass
+
+
+        test_user_db_home = os.path.join(test_state_path, 'user_db_home')
         self.expected_user_db_home = test_user_db_home
 
     def _provide_configuration(self):