← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_pack_repository.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-12-23 00:59:10 UTC
  • mfrom: (4794.1.21 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20091223005910-zatr8ajlw8ul6d6s
(robertc) Add testtools 0.9.2 as a hard dependency to run the test
        suite, improving debug output on selftest --parallel,
        reducing code size and adding support for assertThat. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_pack_repository.py
687
687
        # abort_write_group will not raise an error
688
688
        self.assertEqual(None, repo.abort_write_group(suppress_errors=True))
689
689
        # But it does log an error
690
 
        log_file = self._get_log(keep_log_file=True)
691
 
        self.assertContainsRe(log_file, 'abort_write_group failed')
692
 
        self.assertContainsRe(log_file, r'INFO  bzr: ERROR \(ignored\):')
 
690
        log = self.get_log()
 
691
        self.assertContainsRe(log, 'abort_write_group failed')
 
692
        self.assertContainsRe(log, r'INFO  bzr: ERROR \(ignored\):')
693
693
        if token is not None:
694
694
            repo.leave_lock_in_place()
695
695