fixup

Author: albu-diku

mig/shared/useradm.py

@@ -465,8 +465,9 @@ def _provision_directories(configuration):
         try:
             dir_to_create = getattr(configuration, config_attr)
             os.mkdir(dir_to_create)
-        except FileExistsError:
-            pass
+        except OSError as oserr:
+            if oserr.errno != errno.ENOENT: # FileNotFoundError
+                raise
 
 
 def create_user_in_db(configuration, db_path, client_id, user, now, authorized,
@@ -486,7 +487,7 @@ def create_user_in_db(configuration, db_path, client_id, user, now, authorized,
     if do_lock:
         try:
             flock = lock_user_db(db_path)
-        except OSError as oserr:
+        except (IOError, OSError) as oserr:
             if oserr.errno != errno.ENOENT: # FileNotFoundError
                 raise
 

tests/test_mig_server_createuser.py

@@ -41,16 +41,14 @@ def before_each(self):
         configuration = self.configuration
         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)
+        for config_key in ('user_db_home', 'user_home', 'user_settings', 'user_cache', 'mrsl_files_dir', 'resource_pending'):
+            dir_path = getattr(configuration, config_key)[0:-1]
             try:
-                shutil.rmtree(stat_dir_path)
+                shutil.rmtree(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
+        self.expected_user_db_home = configuration.user_db_home[0:-1]
 
     def _provide_configuration(self):
         return 'testconfig'