← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_btree_index.py

Put in place a structure for the admin-guide

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_btree_index.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
27
27
    lru_cache,
28
28
    osutils,
29
29
    tests,
30
 
    transport,
31
30
    )
32
31
from bzrlib.tests import (
33
32
    TestCaseWithTransport,
35
34
    multiply_tests,
36
35
    split_suite_by_condition,
37
36
    )
 
37
from bzrlib.transport import get_transport
38
38
 
39
39
 
40
40
def load_tests(standard_tests, module, loader):
43
43
        condition_isinstance(TestBTreeNodes))
44
44
    import bzrlib._btree_serializer_py as py_module
45
45
    scenarios = [('python', {'parse_btree': py_module})]
46
 
    if compiled_btreeparser_feature.available():
47
 
        scenarios.append(('C', {'parse_btree':
48
 
                                compiled_btreeparser_feature.module}))
 
46
    if CompiledBtreeParserFeature.available():
 
47
        # Is there a way to do this that gets missing feature failures rather
 
48
        # than no indication to the user?
 
49
        import bzrlib._btree_serializer_pyx as c_module
 
50
        scenarios.append(('C', {'parse_btree': c_module}))
49
51
    return multiply_tests(node_tests, scenarios, others)
50
52
 
51
53
 
52
 
compiled_btreeparser_feature = tests.ModuleAvailableFeature(
53
 
                                'bzrlib._btree_serializer_pyx')
 
54
class _CompiledBtreeParserFeature(tests.Feature):
 
55
    def _probe(self):
 
56
        try:
 
57
            import bzrlib._btree_serializer_pyx
 
58
        except ImportError:
 
59
            return False
 
60
        return True
 
61
 
 
62
    def feature_name(self):
 
63
        return 'bzrlib._btree_serializer_pyx'
 
64
 
 
65
CompiledBtreeParserFeature = _CompiledBtreeParserFeature()
54
66
 
55
67
 
56
68
class BTreeTestCase(TestCaseWithTransport):
59
71
 
60
72
    def setUp(self):
61
73
        TestCaseWithTransport.setUp(self)
62
 
        self.overrideAttr(btree_index, '_RESERVED_HEADER_BYTES', 100)
 
74
        self._original_header = btree_index._RESERVED_HEADER_BYTES
 
75
        def restore():
 
76
            btree_index._RESERVED_HEADER_BYTES = self._original_header
 
77
        self.addCleanup(restore)
 
78
        btree_index._RESERVED_HEADER_BYTES = 100
63
79
 
64
80
    def make_nodes(self, count, key_elements, reference_lists):
65
81
        """Generate count*key_elements sample nodes."""
99
115
 
100
116
    def shrink_page_size(self):
101
117
        """Shrink the default page size so that less fits in a page."""
102
 
        self.overrideAttr(btree_index, '_PAGE_SIZE')
 
118
        old_page_size = btree_index._PAGE_SIZE
 
119
        def cleanup():
 
120
            btree_index._PAGE_SIZE = old_page_size
 
121
        self.addCleanup(cleanup)
103
122
        btree_index._PAGE_SIZE = 2048
104
123
 
105
124
 
280
299
 
281
300
        for node in nodes:
282
301
            builder.add_node(*node)
283
 
        t = transport.get_transport('trace+' + self.get_url(''))
284
 
        size = t.put_file('index', self.time(builder.finish))
 
302
        transport = get_transport('trace+' + self.get_url(''))
 
303
        size = transport.put_file('index', self.time(builder.finish))
285
304
        del builder
286
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
305
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
287
306
        # Seed the metadata, we're using internal calls now.
288
307
        index.key_count()
289
308
        self.assertEqual(3, len(index._row_lengths),
409
428
        self.assertEqual(None, builder._backing_indices[2])
410
429
        self.assertEqual(16, builder._backing_indices[3].key_count())
411
430
        # Now finish, and check we got a correctly ordered tree
412
 
        t = self.get_transport('')
413
 
        size = t.put_file('index', builder.finish())
414
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
431
        transport = self.get_transport('')
 
432
        size = transport.put_file('index', builder.finish())
 
433
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
415
434
        nodes = list(index.iter_all_entries())
416
435
        self.assertEqual(sorted(nodes), nodes)
417
436
        self.assertEqual(16, len(nodes))
607
626
        for key, value, references in nodes:
608
627
            builder.add_node(key, value, references)
609
628
        stream = builder.finish()
610
 
        trans = transport.get_transport('trace+' + self.get_url())
 
629
        trans = get_transport('trace+' + self.get_url())
611
630
        size = trans.put_file('index', stream)
612
631
        return btree_index.BTreeGraphIndex(trans, 'index', size)
613
632
 
614
 
    def make_index_with_offset(self, ref_lists=1, key_elements=1, nodes=[],
615
 
                               offset=0):
616
 
        builder = btree_index.BTreeBuilder(key_elements=key_elements,
617
 
                                           reference_lists=ref_lists)
618
 
        builder.add_nodes(nodes)
619
 
        transport = self.get_transport('')
620
 
        # NamedTemporaryFile dies on builder.finish().read(). weird.
621
 
        temp_file = builder.finish()
622
 
        content = temp_file.read()
623
 
        del temp_file
624
 
        size = len(content)
625
 
        transport.put_bytes('index', (' '*offset)+content)
626
 
        return btree_index.BTreeGraphIndex(transport, 'index', size=size,
627
 
                                           offset=offset)
628
 
 
629
633
    def test_clear_cache(self):
630
634
        nodes = self.make_nodes(160, 2, 2)
631
635
        index = self.make_index(ref_lists=2, key_elements=2, nodes=nodes)
648
652
        self.assertEqual(0, len(index._leaf_node_cache))
649
653
 
650
654
    def test_trivial_constructor(self):
651
 
        t = transport.get_transport('trace+' + self.get_url(''))
652
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
 
655
        transport = get_transport('trace+' + self.get_url(''))
 
656
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
653
657
        # Checks the page size at load, but that isn't logged yet.
654
 
        self.assertEqual([], t._activity)
 
658
        self.assertEqual([], transport._activity)
655
659
 
656
660
    def test_with_size_constructor(self):
657
 
        t = transport.get_transport('trace+' + self.get_url(''))
658
 
        index = btree_index.BTreeGraphIndex(t, 'index', 1)
 
661
        transport = get_transport('trace+' + self.get_url(''))
 
662
        index = btree_index.BTreeGraphIndex(transport, 'index', 1)
659
663
        # Checks the page size at load, but that isn't logged yet.
660
 
        self.assertEqual([], t._activity)
 
664
        self.assertEqual([], transport._activity)
661
665
 
662
666
    def test_empty_key_count_no_size(self):
663
667
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
664
 
        t = transport.get_transport('trace+' + self.get_url(''))
665
 
        t.put_file('index', builder.finish())
666
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
667
 
        del t._activity[:]
668
 
        self.assertEqual([], t._activity)
 
668
        transport = get_transport('trace+' + self.get_url(''))
 
669
        transport.put_file('index', builder.finish())
 
670
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
 
671
        del transport._activity[:]
 
672
        self.assertEqual([], transport._activity)
669
673
        self.assertEqual(0, index.key_count())
670
674
        # The entire index should have been requested (as we generally have the
671
675
        # size available, and doing many small readvs is inappropriate).
672
676
        # We can't tell how much was actually read here, but - check the code.
673
 
        self.assertEqual([('get', 'index')], t._activity)
 
677
        self.assertEqual([('get', 'index')], transport._activity)
674
678
 
675
679
    def test_empty_key_count(self):
676
680
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
677
 
        t = transport.get_transport('trace+' + self.get_url(''))
678
 
        size = t.put_file('index', builder.finish())
 
681
        transport = get_transport('trace+' + self.get_url(''))
 
682
        size = transport.put_file('index', builder.finish())
679
683
        self.assertEqual(72, size)
680
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
681
 
        del t._activity[:]
682
 
        self.assertEqual([], t._activity)
 
684
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
685
        del transport._activity[:]
 
686
        self.assertEqual([], transport._activity)
683
687
        self.assertEqual(0, index.key_count())
684
688
        # The entire index should have been read, as 4K > size
685
689
        self.assertEqual([('readv', 'index', [(0, 72)], False, None)],
686
 
                         t._activity)
 
690
            transport._activity)
687
691
 
688
692
    def test_non_empty_key_count_2_2(self):
689
693
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
690
694
        nodes = self.make_nodes(35, 2, 2)
691
695
        for node in nodes:
692
696
            builder.add_node(*node)
693
 
        t = transport.get_transport('trace+' + self.get_url(''))
694
 
        size = t.put_file('index', builder.finish())
695
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
696
 
        del t._activity[:]
697
 
        self.assertEqual([], t._activity)
 
697
        transport = get_transport('trace+' + self.get_url(''))
 
698
        size = transport.put_file('index', builder.finish())
 
699
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
700
        del transport._activity[:]
 
701
        self.assertEqual([], transport._activity)
698
702
        self.assertEqual(70, index.key_count())
699
703
        # The entire index should have been read, as it is one page long.
700
704
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
701
 
            t._activity)
 
705
            transport._activity)
702
706
        self.assertEqual(1173, size)
703
707
 
704
 
    def test_with_offset_no_size(self):
705
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
706
 
                                            offset=1234,
707
 
                                            nodes=self.make_nodes(200, 1, 1))
708
 
        index._size = None # throw away the size info
709
 
        self.assertEqual(200, index.key_count())
710
 
 
711
 
    def test_with_small_offset(self):
712
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
713
 
                                            offset=1234,
714
 
                                            nodes=self.make_nodes(200, 1, 1))
715
 
        self.assertEqual(200, index.key_count())
716
 
 
717
 
    def test_with_large_offset(self):
718
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
719
 
                                            offset=123456,
720
 
                                            nodes=self.make_nodes(200, 1, 1))
721
 
        self.assertEqual(200, index.key_count())
722
 
 
723
708
    def test__read_nodes_no_size_one_page_reads_once(self):
724
709
        self.make_index(nodes=[(('key',), 'value', ())])
725
 
        trans = transport.get_transport('trace+' + self.get_url())
 
710
        trans = get_transport('trace+' + self.get_url())
726
711
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
727
712
        del trans._activity[:]
728
713
        nodes = dict(index._read_nodes([0]))
736
721
        index.key_count()
737
722
        num_pages = index._row_offsets[-1]
738
723
        # Reopen with a traced transport and no size
739
 
        trans = transport.get_transport('trace+' + self.get_url())
 
724
        trans = get_transport('trace+' + self.get_url())
740
725
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
741
726
        del trans._activity[:]
742
727
        nodes = dict(index._read_nodes([0]))
747
732
        nodes = self.make_nodes(160, 2, 2)
748
733
        for node in nodes:
749
734
            builder.add_node(*node)
750
 
        t = transport.get_transport('trace+' + self.get_url(''))
751
 
        size = t.put_file('index', builder.finish())
 
735
        transport = get_transport('trace+' + self.get_url(''))
 
736
        size = transport.put_file('index', builder.finish())
752
737
        self.assertEqual(17692, size)
753
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
754
 
        del t._activity[:]
755
 
        self.assertEqual([], t._activity)
 
738
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
739
        del transport._activity[:]
 
740
        self.assertEqual([], transport._activity)
756
741
        self.assertEqual(320, index.key_count())
757
742
        # The entire index should not have been read.
758
743
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None)],
759
 
                         t._activity)
 
744
            transport._activity)
760
745
 
761
746
    def test_validate_one_page(self):
762
747
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
763
748
        nodes = self.make_nodes(45, 2, 2)
764
749
        for node in nodes:
765
750
            builder.add_node(*node)
766
 
        t = transport.get_transport('trace+' + self.get_url(''))
767
 
        size = t.put_file('index', builder.finish())
768
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
769
 
        del t._activity[:]
770
 
        self.assertEqual([], t._activity)
 
751
        transport = get_transport('trace+' + self.get_url(''))
 
752
        size = transport.put_file('index', builder.finish())
 
753
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
754
        del transport._activity[:]
 
755
        self.assertEqual([], transport._activity)
771
756
        index.validate()
772
757
        # The entire index should have been read linearly.
773
758
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
774
 
                         t._activity)
 
759
            transport._activity)
775
760
        self.assertEqual(1488, size)
776
761
 
777
762
    def test_validate_two_pages(self):
779
764
        nodes = self.make_nodes(80, 2, 2)
780
765
        for node in nodes:
781
766
            builder.add_node(*node)
782
 
        t = transport.get_transport('trace+' + self.get_url(''))
783
 
        size = t.put_file('index', builder.finish())
 
767
        transport = get_transport('trace+' + self.get_url(''))
 
768
        size = transport.put_file('index', builder.finish())
784
769
        # Root page, 2 leaf pages
785
770
        self.assertEqual(9339, size)
786
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
787
 
        del t._activity[:]
788
 
        self.assertEqual([], t._activity)
 
771
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
772
        del transport._activity[:]
 
773
        self.assertEqual([], transport._activity)
789
774
        index.validate()
790
775
        # The entire index should have been read linearly.
791
 
        self.assertEqual(
792
 
            [('readv', 'index', [(0, 4096)], False, None),
793
 
             ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
794
 
            t._activity)
 
776
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
 
777
            ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
 
778
            transport._activity)
795
779
        # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
796
780
        # node and make validate find them.
797
781
 
798
782
    def test_eq_ne(self):
799
783
        # two indices are equal when constructed with the same parameters:
800
 
        t1 = transport.get_transport('trace+' + self.get_url(''))
801
 
        t2 = transport.get_transport(self.get_url(''))
802
 
        self.assertTrue(
803
 
            btree_index.BTreeGraphIndex(t1, 'index', None) ==
804
 
            btree_index.BTreeGraphIndex(t1, 'index', None))
805
 
        self.assertTrue(
806
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
807
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
808
 
        self.assertFalse(
809
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
810
 
            btree_index.BTreeGraphIndex(t2, 'index', 20))
811
 
        self.assertFalse(
812
 
            btree_index.BTreeGraphIndex(t1, 'inde1', 20) ==
813
 
            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
814
 
        self.assertFalse(
815
 
            btree_index.BTreeGraphIndex(t1, 'index', 10) ==
816
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
817
 
        self.assertFalse(
818
 
            btree_index.BTreeGraphIndex(t1, 'index', None) !=
819
 
            btree_index.BTreeGraphIndex(t1, 'index', None))
820
 
        self.assertFalse(
821
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
822
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
823
 
        self.assertTrue(
824
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
825
 
            btree_index.BTreeGraphIndex(t2, 'index', 20))
826
 
        self.assertTrue(
827
 
            btree_index.BTreeGraphIndex(t1, 'inde1', 20) !=
828
 
            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
829
 
        self.assertTrue(
830
 
            btree_index.BTreeGraphIndex(t1, 'index', 10) !=
831
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
 
784
        transport1 = get_transport('trace+' + self.get_url(''))
 
785
        transport2 = get_transport(self.get_url(''))
 
786
        self.assertTrue(
 
787
            btree_index.BTreeGraphIndex(transport1, 'index', None) ==
 
788
            btree_index.BTreeGraphIndex(transport1, 'index', None))
 
789
        self.assertTrue(
 
790
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
 
791
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
792
        self.assertFalse(
 
793
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
 
794
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
 
795
        self.assertFalse(
 
796
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) ==
 
797
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
 
798
        self.assertFalse(
 
799
            btree_index.BTreeGraphIndex(transport1, 'index', 10) ==
 
800
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
801
        self.assertFalse(
 
802
            btree_index.BTreeGraphIndex(transport1, 'index', None) !=
 
803
            btree_index.BTreeGraphIndex(transport1, 'index', None))
 
804
        self.assertFalse(
 
805
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
 
806
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
807
        self.assertTrue(
 
808
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
 
809
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
 
810
        self.assertTrue(
 
811
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) !=
 
812
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
 
813
        self.assertTrue(
 
814
            btree_index.BTreeGraphIndex(transport1, 'index', 10) !=
 
815
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
832
816
 
833
817
    def test_iter_all_only_root_no_size(self):
834
818
        self.make_index(nodes=[(('key',), 'value', ())])
835
 
        t = transport.get_transport('trace+' + self.get_url(''))
836
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
837
 
        del t._activity[:]
 
819
        trans = get_transport('trace+' + self.get_url(''))
 
820
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
 
821
        del trans._activity[:]
838
822
        self.assertEqual([(('key',), 'value')],
839
823
                         [x[1:] for x in index.iter_all_entries()])
840
 
        self.assertEqual([('get', 'index')], t._activity)
 
824
        self.assertEqual([('get', 'index')], trans._activity)
841
825
 
842
826
    def test_iter_all_entries_reads(self):
843
827
        # iterating all entries reads the header, then does a linear
849
833
        nodes = self.make_nodes(10000, 2, 2)
850
834
        for node in nodes:
851
835
            builder.add_node(*node)
852
 
        t = transport.get_transport('trace+' + self.get_url(''))
853
 
        size = t.put_file('index', builder.finish())
 
836
        transport = get_transport('trace+' + self.get_url(''))
 
837
        size = transport.put_file('index', builder.finish())
854
838
        self.assertEqual(1303220, size, 'number of expected bytes in the'
855
839
                                        ' output changed')
856
840
        page_size = btree_index._PAGE_SIZE
857
841
        del builder
858
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
859
 
        del t._activity[:]
860
 
        self.assertEqual([], t._activity)
 
842
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
843
        del transport._activity[:]
 
844
        self.assertEqual([], transport._activity)
861
845
        found_nodes = self.time(list, index.iter_all_entries())
862
846
        bare_nodes = []
863
847
        for node in found_nodes:
884
868
        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
885
869
        expected = [('readv', 'index', [(0, page_size)], False, None),
886
870
             ('readv',  'index', readv_request, False, None)]
887
 
        if expected != t._activity:
 
871
        if expected != transport._activity:
888
872
            self.assertEqualDiff(pprint.pformat(expected),
889
873
                                 pprint.pformat(transport._activity))
890
874
 
904
888
        nodes = self.make_nodes(160, 2, 2)
905
889
        for node in nodes:
906
890
            builder.add_node(*node)
907
 
        t = transport.get_transport('trace+' + self.get_url(''))
908
 
        size = t.put_file('index', builder.finish())
 
891
        transport = get_transport('trace+' + self.get_url(''))
 
892
        size = transport.put_file('index', builder.finish())
909
893
        del builder
910
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
911
 
        del t._activity[:]
912
 
        self.assertEqual([], t._activity)
 
894
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
895
        del transport._activity[:]
 
896
        self.assertEqual([], transport._activity)
913
897
        # search for one key
914
898
        found_nodes = list(index.iter_entries([nodes[30][0]]))
915
899
        bare_nodes = []
923
907
        # Should have read the root node, then one leaf page:
924
908
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
925
909
             ('readv',  'index', [(8192, 4096), ], False, None)],
926
 
            t._activity)
 
910
            transport._activity)
927
911
 
928
912
    def test_iter_key_prefix_1_element_key_None(self):
929
913
        index = self.make_index()
1153
1137
        for node in nodes:
1154
1138
            builder.add_node(*node)
1155
1139
        stream = builder.finish()
1156
 
        trans = transport.get_transport(self.get_url())
 
1140
        trans = get_transport(self.get_url())
1157
1141
        size = trans.put_file('index', stream)
1158
1142
        index = btree_index.BTreeGraphIndex(trans, 'index', size)
1159
1143
        self.assertEqual(500, index.key_count())
1185
1169
 
1186
1170
class TestBTreeNodes(BTreeTestCase):
1187
1171
 
 
1172
    def restore_parser(self):
 
1173
        btree_index._btree_serializer = self.saved_parser
 
1174
 
1188
1175
    def setUp(self):
1189
1176
        BTreeTestCase.setUp(self)
1190
 
        self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
 
1177
        self.saved_parser = btree_index._btree_serializer
 
1178
        self.addCleanup(self.restore_parser)
 
1179
        btree_index._btree_serializer = self.parse_btree
1191
1180
 
1192
1181
    def test_LeafNode_1_0(self):
1193
1182
        node_bytes = ("type=leaf\n"
1304
1293
    def test_exists(self):
1305
1294
        # This is just to let the user know if they don't have the feature
1306
1295
        # available
1307
 
        self.requireFeature(compiled_btreeparser_feature)
 
1296
        self.requireFeature(CompiledBtreeParserFeature)
1308
1297
 
1309
1298
 
1310
1299
class TestMultiBisectRight(tests.TestCase):
1350
1339
        This doesn't actually create anything on disk, it just primes a
1351
1340
        BTreeGraphIndex with the recommended information.
1352
1341
        """
1353
 
        index = btree_index.BTreeGraphIndex(
1354
 
            transport.get_transport('memory:///'), 'test-index', size=size)
 
1342
        index = btree_index.BTreeGraphIndex(get_transport('memory:///'),
 
1343
                                            'test-index', size=size)
1355
1344
        if recommended_pages is not None:
1356
1345
            index._recommended_pages = recommended_pages
1357
1346
        return index