~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/benchmarks/bench_dirstate.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-19 00:32:14 UTC
  • mfrom: (4685.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
(mbp for garyvdm) Revert rename of
        test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2007 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
26
26
    tests,
27
27
    )
28
28
from bzrlib.tests.test__dirstate_helpers import (
29
 
    compiled_dirstate_helpers_feature,
 
29
    CompiledDirstateHelpersFeature,
30
30
    )
31
31
 
32
32
 
206
206
            state.unlock()
207
207
 
208
208
    def test__read_dirblocks_20k_tree_0_parents_pyx(self):
209
 
        self.requireFeature(compiled_dirstate_helpers_feature)
 
209
        self.requireFeature(CompiledDirstateHelpersFeature)
210
210
        from bzrlib._dirstate_helpers_pyx import _read_dirblocks
211
211
        state = self.build_20k_dirstate()
212
212
        state.lock_read()
231
231
            state.unlock()
232
232
 
233
233
    def test__read_dirblocks_20k_tree_1_parent_pyx(self):
234
 
        self.requireFeature(compiled_dirstate_helpers_feature)
 
234
        self.requireFeature(CompiledDirstateHelpersFeature)
235
235
        from bzrlib._dirstate_helpers_pyx import _read_dirblocks
236
236
        state = self.build_20k_dirstate_with_parents(1)
237
237
        state.lock_read()
256
256
            state.unlock()
257
257
 
258
258
    def test__read_dirblocks_20k_tree_2_parents_pyx(self):
259
 
        self.requireFeature(compiled_dirstate_helpers_feature)
 
259
        self.requireFeature(CompiledDirstateHelpersFeature)
260
260
        from bzrlib._dirstate_helpers_pyx import _read_dirblocks
261
261
        state = self.build_20k_dirstate_with_parents(2)
262
262
        state.lock_read()
337
337
            state.unlock()
338
338
 
339
339
    def test_bisect_dirblock_pyx(self):
340
 
        self.requireFeature(compiled_dirstate_helpers_feature)
 
340
        self.requireFeature(CompiledDirstateHelpersFeature)
341
341
        from bzrlib._dirstate_helpers_pyx import bisect_dirblock
342
342
        state = self.build_10k_dirstate_dirs()
343
343
        state.lock_read()
420
420
                             [(3, 1), (3, 1), (3, 1), (3, 2)])
421
421
 
422
422
    def test_cmp_by_dirs_pyrex(self):
423
 
        self.requireFeature(compiled_dirstate_helpers_feature)
 
423
        self.requireFeature(CompiledDirstateHelpersFeature)
424
424
        from bzrlib._dirstate_helpers_pyx import cmp_by_dirs
425
425
        self.compareAllPaths(cmp_by_dirs,
426
426
                             [(3, 1), (3, 1), (3, 1), (3, 2)])