← Back to branch summary

~tr3buchet/nova/lock

« back to all changes in this revision

Viewing changes to nova/tests/auth_unittest.py

  • Committer: Vishvananda Ishaya
  • Date: 2010-12-22 20:59:53 UTC
  • mto: This revision was merged to the branch mainline in revision 482.
  • Revision ID: vishvananda@gmail.com-20101222205953-j2j5t0qjwlcd0t2s
merge trunk and upgrade to cheetah templating

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/auth_unittest.py
333
333
        AuthManagerTestCase.__init__(self)
334
334
        test.TestCase.__init__(self, *args, **kwargs)
335
335
        import nova.auth.fakeldap as fakeldap
336
 
        FLAGS.redis_db = 8
337
336
        if FLAGS.flush_db:
338
 
            logging.info("Flushing redis datastore")
339
 
            try:
340
 
                r = fakeldap.Redis.instance()
341
 
                r.flushdb()
342
 
            except:
343
 
                self.skip = True
 
337
            logging.info("Flushing datastore")
 
338
            r = fakeldap.Store.instance()
 
339
            r.flushdb()
344
340
 
345
341
 
346
342
class AuthManagerDbTestCase(AuthManagerTestCase, test.TestCase):