Add a few more user state dirs made by actual user creation in provision user helper

tests/support/usersupp.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 #
 # --- BEGIN_HEADER ---
@@ -27,8 +27,8 @@
 
 """User related details within the test support library."""
 
 import datetime
 import errno
 import os
 import pickle
 
@@ -37,7 +37,9 @@
 from tests.support.fixturesupp import _PreparedFixture
 
 
 TEST_USER_DN = '/C=DK/ST=NA/L=NA/O=Test Org/OU=NA/CN=Test User/emailAddress=test@example.com'
+OTHER_USER_DN = '/C=DK/ST=NA/L=NA/O=Other Org/OU=NA/CN=Other User/emailAddress=other@example.com'
+NO_SUCH_USER_DN = '/C=DK/ST=NA/L=NA/O=No Such Org/OU=NA/CN=No Such User/emailAddress=nosuchuser@example.com'
 
 _FIXTURE_NAME_BY_USER_DN = {
     TEST_USER_DN: 'MiG-users.db--example'
@@ -65,7 +67,7 @@
 
         return conf_user_db_home
 
     @staticmethod
     def _provision_test_user(testcase, distinguished_name):
         """
         Fabricate a test user on demand.
@@ -91,7 +93,7 @@
         # write out the user database fixture containing the user
         prepared_fixture.write_to_dir(conf_user_db_home, output_format='pickle')
 
         test_user_dir = UserAssertMixin._provision_test_user_dirs(testcase, distinguished_name)
 
         return test_user_dir
 
@@ -112,17 +114,26 @@
 
         # create the test user settings directory
         conf_user_settings = os.path.normpath(self.configuration.user_settings)
         test_user_settings_dir = os.path.join(conf_user_settings, test_client_dir_name)
         os.makedirs(test_user_settings_dir)
 
         # create an empty user settings file
         test_user_settings_file = os.path.join(test_user_settings_dir, 'settings')
         with open(test_user_settings_file, 'wb') as outfile:
             pickle.dump({}, outfile)
 
+        # create the test user cache, resource pending and mrsl files sub dirs
+        for sub in (self.configuration.user_cache,
+                    self.configuration.resource_pending,
+                    self.configuration.mrsl_files_dir):
+            conf_user_sub = os.path.normpath(sub)
+            test_user_sub_dir = os.path.join(
+                conf_user_sub, test_client_dir_name)
+            os.makedirs(test_user_sub_dir)
+
         return test_user_dir
 
     @staticmethod
     def _provision_test_users(testcase, *distinguished_names):
         """
         Fabricate multiple users on demand.
@@ -134,8 +145,8 @@
         that the user db will be populated from arbitrary data and thus
         the test dependent upon this is less strongly assured, but if
         (as is the expectation) the basic operations are validated with
-        "indenpdent" data i.e. conained within fixtures as opposed to
-        generated by logic that extended tests which need
+        "independent" data i.e. contained within fixtures as opposed to
+        generated by logic that extended tests will need.
         """
 
         conf_user_db_home = UserAssertMixin._provision_user_db_dir(testcase)
@@ -155,8 +166,8 @@
         # fixture with their data but using a known fixture name and thus one
         # suitably hinted so a production format pickle file ends up on-disk
         prepared_fixture = _PreparedFixture(testcase, 'MiG-users.db--example')
         prepared_fixture.fixture_data = users_by_dn
         prepared_fixture.write_to_dir(conf_user_db_home, output_format='pickle')
 
         for distinguished_name in distinguished_names:
             UserAssertMixin._provision_test_user_dirs(testcase, distinguished_name)