fixups

Author: albu-diku

mig/shared/useradm.py

@@ -101,6 +101,10 @@
 https_authdigests = user_db_filename
 
 
+_USERADM_CONFIG_DIR_KEYS = ('user_db_home', 'user_home', 'user_settings',
+                            'user_cache', 'mrsl_files_dir', 'resource_pending')
+
+
 def init_user_adm(dynamic_db_path=True):
     """Shared init function for all user administration scripts.
     The optional dynamic_db_path argument toggles dynamic user db path lookup
@@ -461,12 +465,12 @@ def _check_directories_unprovisioned(configuration, db_path):
 
 
 def _provision_directories(configuration):
-    for config_attr in ('user_db_home', 'user_home', 'user_settings', 'user_cache', 'mrsl_files_dir', 'resource_pending'):
+    for config_attr in _USERADM_CONFIG_DIR_KEYS:
         try:
             dir_to_create = getattr(configuration, config_attr)
             os.mkdir(dir_to_create)
         except OSError as oserr:
-            if oserr.errno != errno.ENOENT: # FileNotFoundError
+            if oserr.errno != errno.ENOENT:  # FileNotFoundError
                 raise
 
 
@@ -488,7 +492,7 @@ def create_user_in_db(configuration, db_path, client_id, user, now, authorized,
         try:
             flock = lock_user_db(db_path)
         except (IOError, OSError) as oserr:
-            if oserr.errno != errno.ENOENT: # FileNotFoundError
+            if oserr.errno != errno.ENOENT:  # FileNotFoundError
                 raise
 
             if _check_directories_unprovisioned(configuration, db_path=db_path):

tests/test_mig_server_createuser.py

@@ -35,13 +35,15 @@
 from tests.support import MIG_BASE, TEST_OUTPUT_DIR, MigTestCase, testmain
 
 from mig.server.createuser import main as createuser
+from mig.shared.useradm import _USERADM_CONFIG_DIR_KEYS
+
 
 class TestBooleans(MigTestCase):
     def before_each(self):
         configuration = self.configuration
         test_state_path = configuration.state_path
 
-        for config_key in ('user_db_home', 'user_home', 'user_settings', 'user_cache', 'mrsl_files_dir', 'resource_pending'):
+        for config_key in _USERADM_CONFIG_DIR_KEYS:
             dir_path = getattr(configuration, config_key)[0:-1]
             try:
                 shutil.rmtree(dir_path)
@@ -64,14 +66,16 @@ def test_user_db_is_created_and_user_is_added(self):
             "This is the create comment",
             "password"
         ]
+        print("")  # acount for output generated by the logic
         createuser(args, TEST_OUTPUT_DIR, configuration=self.configuration)
 
         # presence of user home
         path_kind = MigTestCase._absolute_path_kind(self.expected_user_db_home)
         self.assertEqual(path_kind, 'dir')
 
         # presence of user db
-        expected_user_db_file = os.path.join(self.expected_user_db_home, 'MiG-users.db')
+        expected_user_db_file = os.path.join(
+            self.expected_user_db_home, 'MiG-users.db')
         path_kind = MigTestCase._absolute_path_kind(expected_user_db_file)
         self.assertEqual(path_kind, 'file')