← 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: Aaron Bentley
  • Date: 2008-06-06 16:40:46 UTC
  • mfrom: (3482 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3483.
  • Revision ID: aaron@aaronbentley.com-20080606164046-ghbxplxuhtpcb9iz
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockdir.py
190
190
            lf1.unlock()
191
191
        lock_base = lf2.transport.abspath(lf2.path)
192
192
        self.assertEqual(1, len(self._logged_reports))
 
193
        lock_url = lf2.transport.abspath(lf2.path)
193
194
        self.assertEqual('%s %s\n'
194
195
                         '%s\n%s\n'
195
 
                         'Will continue to try until %s\n',
 
196
                         'Will continue to try until %s, unless '
 
197
                         'you press Ctrl-C\n'
 
198
                         'If you\'re sure that it\'s not being '
 
199
                         'modified, use bzr break-lock %s',
196
200
                         self._logged_reports[0][0])
197
201
        args = self._logged_reports[0][1]
198
202
        self.assertEqual('Unable to obtain', args[0])
406
410
        # There should be 2 reports, because the lock changed
407
411
        lock_base = lf2.transport.abspath(lf2.path)
408
412
        self.assertEqual(2, len(self._logged_reports))
409
 
 
 
413
        lock_url = lf2.transport.abspath(lf2.path)
410
414
        self.assertEqual('%s %s\n'
411
415
                         '%s\n%s\n'
412
 
                         'Will continue to try until %s\n',
 
416
                         'Will continue to try until %s, unless '
 
417
                         'you press Ctrl-C\n'
 
418
                         'If you\'re sure that it\'s not being '
 
419
                         'modified, use bzr break-lock %s',
413
420
                         self._logged_reports[0][0])
414
421
        args = self._logged_reports[0][1]
415
422
        self.assertEqual('Unable to obtain', args[0])
421
428
 
422
429
        self.assertEqual('%s %s\n'
423
430
                         '%s\n%s\n'
424
 
                         'Will continue to try until %s\n',
 
431
                         'Will continue to try until %s, unless '
 
432
                         'you press Ctrl-C\n'
 
433
                         'If you\'re sure that it\'s not being '
 
434
                         'modified, use bzr break-lock %s',
425
435
                         self._logged_reports[1][0])
426
436
        args = self._logged_reports[1][1]
427
437
        self.assertEqual('Lock owner changed for', args[0])