/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/benchmarks/bench_knit.py

  • Committer: Vincent Ladeuil
  • Date: 2009-06-30 15:54:23 UTC
  • mto: (4496.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4497.
  • Revision ID: v.ladeuil+lp@free.fr-20090630155423-afousrl3zrdx0he2
Fixed as per jam's review.

* tests/blackbox/test_push.py:
(load_tests): One more changes type.
(TestPushStrictMixin): Switch to using mixin, it's clearer.
Define some default values as attributes so that they can be
changed more easily.
(TestPushStrictMixin.assertPushFails,
TestPushStrictMixin.assertPushSucceeds): Use default values from
attributes.
(TestPushStrictWithChanges._out_of_sync_trees): Setup a new
context and change the default values.

* errors.py:
(OutOfDateTree, UncommittedChanges): Add a more parameter so more
details can be given.

* builtins.py:
(cmd_push.run): Add an additional check that the tree is still in
sync with its branch before pushing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/benchmarks/bench_knit.py
61
61
 
62
62
    def setup_load_data_c(self):
63
63
        self.requireFeature(CompiledKnitFeature)
64
 
        from bzrlib._knit_load_data_pyx import _load_data_c
65
 
        self.overrideAttr(knit, '_load_data', _load_data_c)
 
64
        orig = knit._load_data
 
65
        def reset():
 
66
            knit._load_data = orig
 
67
        self.addCleanup(reset)
 
68
        from bzrlib._knit_load_data_c import _load_data_c
 
69
        knit._load_data = _load_data_c
66
70
 
67
71
    def setup_load_data_py(self):
 
72
        orig = knit._load_data
 
73
        def reset():
 
74
            knit._load_data = orig
 
75
        self.addCleanup(reset)
68
76
        from bzrlib._knit_load_data_py import _load_data_py
69
 
        self.overrideAttr(knit, '_load_data', _load_data_py)
 
77
        knit._load_data = _load_data_py
70
78
 
71
79
    def test_read_50k_index_c(self):
72
80
        self.setup_load_data_c()