← 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

  • Committer: Andrew Starr-Bochicchio
  • Date: 2015-07-31 01:04:41 UTC
  • mto: This revision was merged to the branch mainline in revision 6606.
  • Revision ID: a.starr.b@gmail.com-20150731010441-3domwjjtnjijxlr2
https://launchpad.net/bugs/1480015
Use hexlify() from binascii directly as paramiko removed hexify().

Show diffs side-by-side

added added

removed removed

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