← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository_vf/test_check.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_vf/test_check.py
117
117
    def branch_callback(self, refs):
118
118
        self.callbacks.append(('branch', refs))
119
119
        return self.branch_check(refs)
 
120
 
 
121
 
 
122
class TestNoSpuriousInconsistentAncestors(TestCaseWithRepository):
 
123
 
 
124
    scenarios = all_repository_vf_format_scenarios()
 
125
 
 
126
    def test_two_files_different_versions_no_inconsistencies_bug_165071(self):
 
127
        """Two files, with different versions can be clean."""
 
128
        tree = self.make_branch_and_tree('.')
 
129
        self.build_tree(['foo'])
 
130
        tree.smart_add(['.'])
 
131
        revid1 = tree.commit('1')
 
132
        self.build_tree(['bar'])
 
133
        tree.smart_add(['.'])
 
134
        revid2 = tree.commit('2')
 
135
        check_object = tree.branch.repository.check([revid1, revid2])
 
136
        check_object.report_results(verbose=True)
 
137
        self.assertContainsRe(self.get_log(), "0 unreferenced text versions")
 
138
 
 
139
 
 
140