← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to nova/tests/test_auth.py

  • Committer: Cerberus
  • Date: 2011-02-28 17:39:23 UTC
  • mfrom: (749 nova)
  • mto: This revision was merged to the branch mainline in revision 762.
  • Revision ID: matt.dietz@rackspace.com-20110228173923-1e3upi2ddoc2j4xl
Merge from trunk and merge conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_auth.py
327
327
class AuthManagerLdapTestCase(AuthManagerTestCase, test.TestCase):
328
328
    auth_driver = 'nova.auth.ldapdriver.FakeLdapDriver'
329
329
 
330
 
    def __init__(self, *args, **kwargs):
331
 
        AuthManagerTestCase.__init__(self)
332
 
        test.TestCase.__init__(self, *args, **kwargs)
333
 
        import nova.auth.fakeldap as fakeldap
334
 
        if FLAGS.flush_db:
335
 
            LOG.info("Flushing datastore")
336
 
            r = fakeldap.Store.instance()
337
 
            r.flushdb()
338
 
 
339
330
 
340
331
class AuthManagerDbTestCase(AuthManagerTestCase, test.TestCase):
341
332
    auth_driver = 'nova.auth.dbdriver.DbDriver'