← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_knit.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-13 16:23:07 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: john@arbash-meinel.com-20100113162307-0bs82td16gzih827
Update the MANIFEST.in file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_knit.py
73
73
 
74
74
    def _probe(self):
75
75
        try:
76
 
            import bzrlib._knit_load_data_c
 
76
            import bzrlib._knit_load_data_pyx
77
77
        except ImportError:
78
78
            return False
79
79
        return True
80
80
 
81
81
    def feature_name(self):
82
 
        return 'bzrlib._knit_load_data_c'
 
82
        return 'bzrlib._knit_load_data_pyx'
83
83
 
84
84
CompiledKnitFeature = _CompiledKnitFeature()
85
85
 
366
366
        :return: (versioned_file, reload_counter)
367
367
            versioned_file  a KnitVersionedFiles using the packs for access
368
368
        """
369
 
        builder = self.make_branch_builder('.')
 
369
        builder = self.make_branch_builder('.', format="1.9")
370
370
        builder.start_series()
371
371
        builder.build_snapshot('rev-1', None, [
372
372
            ('add', ('', 'root-id', 'directory', None)),
1316
1316
        def reset():
1317
1317
            knit._load_data = orig
1318
1318
        self.addCleanup(reset)
1319
 
        from bzrlib._knit_load_data_c import _load_data_c
 
1319
        from bzrlib._knit_load_data_pyx import _load_data_c
1320
1320
        knit._load_data = _load_data_c
1321
1321
        allow_writes = lambda: mode == 'w'
1322
1322
        return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)
2230
2230
        # self.assertEqual([("annotate", key_basis)], basis.calls)
2231
2231
        self.assertEqual([('get_parent_map', set([key_basis])),
2232
2232
            ('get_parent_map', set([key_basis])),
2233
 
            ('get_record_stream', [key_basis], 'unordered', True)],
 
2233
            ('get_record_stream', [key_basis], 'topological', True)],
2234
2234
            basis.calls)
2235
2235
 
2236
2236
    def test_check(self):
2342
2342
        # ask which fallbacks have which parents.
2343
2343
        self.assertEqual([
2344
2344
            ("get_parent_map", set([key_basis, key_basis_2, key_missing])),
2345
 
            # unordered is asked for by the underlying worker as it still
2346
 
            # buffers everything while answering - which is a problem!
2347
 
            ("get_record_stream", [key_basis_2, key_basis], 'unordered', True)],
 
2345
            # topological is requested from the fallback, because that is what
 
2346
            # was requested at the top level.
 
2347
            ("get_record_stream", [key_basis_2, key_basis], 'topological', True)],
2348
2348
            calls)
2349
2349
 
2350
2350
    def test_get_record_stream_unordered_deltas(self):
2571
2571
        last_call = basis.calls[-1]
2572
2572
        self.assertEqual('get_record_stream', last_call[0])
2573
2573
        self.assertEqual(set([key_left, key_right]), set(last_call[1]))
2574
 
        self.assertEqual('unordered', last_call[2])
 
2574
        self.assertEqual('topological', last_call[2])
2575
2575
        self.assertEqual(True, last_call[3])
2576
2576
 
2577
2577