← Back to branch summary

~ubuntu-branches/ubuntu/raring/keystone/raring-updates

« back to all changes in this revision

Viewing changes to tests/_ldap_livetest.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman
  • Date: 2013-10-17 13:52:59 UTC
  • mfrom: (1.1.37)
  • mto: This revision was merged to the branch mainline in revision 50.
  • Revision ID: package-import@ubuntu.com-20131017135259-dqiwbrzjs1q4mp6q
Tags: 1:2013.1.4-0ubuntu1
https://launchpad.net/bugs/1241202
* Resynchronize with stable/grizzly (9666fc0) (LP: #1241202):
  - [6792499] periodic-keystone-python27-stable-grizzly fails due to"No
    module named netaddr"   LP: 1212939
  - [775d7a7] Fix and test token revocation list API
  - [0876ea2] N+1 lookups in groups SQL LP: 1218675
  - [afbc75b] Disabling a tenant would not disable a user token LP: 1179955
  - [9666fc0] User operations with LDAP Identity and
    enabled_mask/user_enabled_default fail LP: 1210175

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/_ldap_livetest.py
92
92
    def tearDown(self):
93
93
        test.TestCase.tearDown(self)
94
94
 
95
 
    def test_user_enable_attribute_mask(self):
96
 
        raise nose.exc.SkipTest('Test is for Active Directory Only')
97
 
 
98
95
    def test_ldap_dereferencing(self):
99
96
        alt_users_ldif = {'objectclass': ['top', 'organizationalUnit'],
100
97
                          'ou': 'alt_users'}
163
160
                                               alias_dereferencing=deref)
164
161
        self.assertEqual(ldap.DEREF_SEARCHING,
165
162
                         ldap_wrapper.conn.get_option(ldap.OPT_DEREF))
 
163
 
 
164
    def test_user_enable_attribute_mask(self):
 
165
        CONF.ldap.user_enabled_emulation = False
 
166
        CONF.ldap.user_enabled_attribute = 'employeeType'
 
167
        super(LiveLDAPIdentity, self).test_user_enable_attribute_mask()