Fix test_user_enable_attribute_mask so it actually tests

test_user_enable_attribute_mask wasn't actually testing
user_enable_attribute_mask because it didn't reload the backend
after changing the config value.

Change-Id: I9fa6bebe0c4b3d2afc1eb53867cf217b046b0210
Related-Bug: #1210175

2 files changed, 8 insertions, 1 deletions

diff --git a/keystone/tests/_ldap_livetest.py b/keystone/tests/_ldap_livetest.py
index eeaa7e5f..4562ccb6 100644
--- a/keystone/tests/_ldap_livetest.py
+++ b/keystone/tests/_ldap_livetest.py
@@ -156,5 +156,10 @@ class LiveLDAPIdentity(test_backend_ldap.LDAPIdentity):
         self.assertEqual(ldap.DEREF_SEARCHING,
                          ldap_wrapper.conn.get_option(ldap.OPT_DEREF))
 
+    def test_user_enable_attribute_mask(self):
+        CONF.ldap.user_enabled_emulation = False
+        CONF.ldap.user_enabled_attribute = 'employeeType'
+        super(LiveLDAPIdentity, self).test_user_enable_attribute_mask()
+
     def test_create_unicode_user_name(self):
         self.skipTest('Addressed by bug #1172106')
diff --git a/keystone/tests/test_backend_ldap.py b/keystone/tests/test_backend_ldap.py
index 9c1c98d5..6f9cfef9 100644
--- a/keystone/tests/test_backend_ldap.py
+++ b/keystone/tests/test_backend_ldap.py
@@ -454,10 +454,12 @@ class LDAPIdentity(test.TestCase, BaseLDAPIdentity):
         self.assertNotIn('name', role_ref)
 
     def test_user_enable_attribute_mask(self):
-        CONF.ldap.user_enabled_attribute = 'enabled'
         CONF.ldap.user_enabled_mask = 2
         CONF.ldap.user_enabled_default = 512
         self.clear_database()
+        self.load_backends()
+        self.load_fixtures(default_fixtures)
+
         user = {'id': 'fake1', 'name': 'fake1', 'enabled': True}
         self.identity_api.create_user('fake1', user)
         user_ref = self.identity_api.get_user('fake1')