← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_chk_map.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_chk_map.py
1108
1108
        basis_get = basis._store.get_record_stream
1109
1109
        def get_record_stream(keys, order, fulltext):
1110
1110
            if ('sha1:1adf7c0d1b9140ab5f33bb64c6275fa78b1580b7',) in keys:
1111
 
                self.fail("'aaa' pointer was followed %r" % keys)
 
1111
                raise AssertionError("'aaa' pointer was followed %r" % keys)
1112
1112
            return basis_get(keys, order, fulltext)
1113
1113
        basis._store.get_record_stream = get_record_stream
1114
1114
        result = sorted(list(target.iter_changes(basis)))