~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_chk_map.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
"""Tests for maps built on a CHK versionedfiles facility."""
18
18
 
 
19
from itertools import izip
 
20
 
19
21
from bzrlib import (
20
22
    chk_map,
21
23
    errors,
224
226
            "      ('ddd',) 'initial ddd content'\n",
225
227
            c_map._dump_tree())
226
228
 
227
 
    def test_root_only_aaa_ddd_16(self):
 
229
    def test_one_deep_map_16(self):
228
230
        c_map = self.make_root_only_aaa_ddd_map(
229
231
                search_key_func=chk_map._search_key_16)
230
232
        # We use 'aaa' and 'ddd' because they happen to map to 'F' when using
1108
1110
        basis_get = basis._store.get_record_stream
1109
1111
        def get_record_stream(keys, order, fulltext):
1110
1112
            if ('sha1:1adf7c0d1b9140ab5f33bb64c6275fa78b1580b7',) in keys:
1111
 
                raise AssertionError("'aaa' pointer was followed %r" % keys)
 
1113
                self.fail("'aaa' pointer was followed %r" % keys)
1112
1114
            return basis_get(keys, order, fulltext)
1113
1115
        basis._store.get_record_stream = get_record_stream
1114
1116
        result = sorted(list(target.iter_changes(basis)))