~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_check.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:
46
46
        revid2 = tree.commit('2')
47
47
        check_object = tree.branch.repository.check([revid1, revid2])
48
48
        check_object.report_results(verbose=True)
49
 
        log = self._get_log(keep_log_file=True)
50
 
        self.assertContainsRe(log, "0 unreferenced text versions")
 
49
        self.assertContainsRe(self.get_log(), "0 unreferenced text versions")
51
50
 
52
51
 
53
52
class TestFindInconsistentRevisionParents(TestCaseWithBrokenRevisionIndex):
90
89
        # contents of it!
91
90
        check_object = repo.check(['ignored'])
92
91
        check_object.report_results(verbose=False)
93
 
        log = self._get_log(keep_log_file=True)
94
 
        self.assertContainsRe(
95
 
            log, '1 revisions have incorrect parents in the revision index')
 
92
        self.assertContainsRe(self.get_log(),
 
93
            '1 revisions have incorrect parents in the revision index')
96
94
        check_object.report_results(verbose=True)
97
 
        log = self._get_log(keep_log_file=True)
98
95
        self.assertContainsRe(
99
 
            log,
 
96
            self.get_log(),
100
97
            "revision-id has wrong parents in index: "
101
98
            r"\('incorrect-parent',\) should be \(\)")
102
99
 
147
144
        rev_id = builder.commit('first post')
148
145
        result = repo.check(None, check_repo=True)
149
146
        result.report_results(True)
150
 
        log = self._get_log(keep_log_file=True)
 
147
        log = self.get_log()
151
148
        self.assertFalse('Missing' in log, "Something was missing in %r" % log)