fixup

Author: albu-diku

tests/support/__init__.py

@@ -283,6 +283,8 @@ def _ensuredirs(absolute_dir):
         if oserr.errno != errno.EEXIST:
             raise
 
+    return absolute_dir
+
 
 def fixturefile(relative_path, fixture_format=None, include_path=False):
     """Support function for loading fixtures from their serialised format.

tests/test_mig_cgibin_cat.py

@@ -32,18 +32,20 @@ def _provide_configuration(self):
         return 'testconfig'
 
     def before_each(self):
+        # ensure a user home directory for our test user
         conf_user_home = self.configuration.user_home[:-1]
-        client_dir = client_id_dir(self.TEST_CLIENT_ID)
+        test_client_dir = client_id_dir(self.TEST_CLIENT_ID)
+        test_user_dir = os.path.join(conf_user_home, test_client_dir)
 
-        # ensure a user db with our test user
-        db_home = self.configuration.user_db_home
+        # ensure a user db that includes our test user
+        conf_user_db_home = _ensuredirs(self.configuration.user_db_home)
+        _temppath(conf_user_db_home, self)
         db_fixture, db_fixture_file = fixturefile('MiG-users.db--example', fixture_format='binary', include_path=True)
-        test_db_file = _temppath(fixturefile_normname('MiG-users.db--example', prefix=db_home), self)
+        test_db_file = _temppath(fixturefile_normname('MiG-users.db--example', prefix=conf_user_db_home), self)
         shutil.copyfile(db_fixture_file, test_db_file)
 
         # create the test user home directory
-        self.test_user_dir = os.path.join(conf_user_home, client_dir)
-        _ensuredirs(self.test_user_dir)
+        self.test_user_dir = _ensuredirs(test_user_dir)
         _temppath(self.test_user_dir, self)
         self.test_environ = create_http_environ(self.configuration)