← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockdir.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-12 14:55:57 UTC
  • mto: This revision was merged to the branch mainline in revision 5784.
  • Revision ID: john@arbash-meinel.com-20110412145557-ltjdd171cbddfbrf
https://launchpad.net/bugs/758695
Fix bug #758695, correctly order the 'cfn' vs 'cfi' in callgrind output.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockdir.py
403
403
        lf1 = LockDir(t, 'test_lock')
404
404
 
405
405
        lf1.create()
406
 
        self.assertTrue(t.has('test_lock'))
 
406
        self.failUnless(t.has('test_lock'))
407
407
 
408
408
        t.rmdir('test_lock')
409
 
        self.assertFalse(t.has('test_lock'))
 
409
        self.failIf(t.has('test_lock'))
410
410
 
411
411
        # This will create 'test_lock' if it needs to
412
412
        lf1.lock_write()
413
 
        self.assertTrue(t.has('test_lock'))
414
 
        self.assertTrue(t.has('test_lock/held/info'))
 
413
        self.failUnless(t.has('test_lock'))
 
414
        self.failUnless(t.has('test_lock/held/info'))
415
415
 
416
416
        lf1.unlock()
417
 
        self.assertFalse(t.has('test_lock/held/info'))
 
417
        self.failIf(t.has('test_lock/held/info'))
418
418
 
419
419
    def test__format_lock_info(self):
420
420
        ld1 = self.get_lock()