/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/tests/blackbox/test_reconcile.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-05 14:26:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120105142658-vek3v6pzlxb751s2
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. 

@only_raises is evil and gave a hard time since any exception during
save_changes() was swallowed.

Possible improvements: 

- add some needs_write_lock decorators to crucial
  methods (_set_config_location ?) but keep locking the branch at higher levels

- decorate branch.unlock to call stack.save if last_lock() it True
  outside of @only_raises scope (evil decorator)

- add @needs_write_lock to stack.set and stack.remove (will probably get
  rid of most testing issues) we probably need a specialized decorator
  that can relay to the store and from there to the branch or whatever is
  needed. This will also helps bzr config to get it right. The
  get_mutable_section trick should not be needed anymore either.

- decorate branch.unlock to call stack.save if last_lock() it True outside
  of @only_raises scope (evil decorator)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
20
20
from bzrlib import (
21
21
    bzrdir,
22
22
    inventory,
23
 
    repository,
24
23
    tests,
25
24
    )
26
25
 
72
71
                     does_backup_text))
73
72
        self.assertEqualDiff(expected, out)
74
73
        self.assertEqualDiff(err, "")
 
74
 
 
75
 
 
76
class TestSmartServerReconcile(tests.TestCaseWithTransport):
 
77
 
 
78
    def test_simple_reconcile(self):
 
79
        self.setup_smart_server_with_call_log()
 
80
        self.make_branch('branch')
 
81
        self.reset_smart_call_log()
 
82
        out, err = self.run_bzr(['reconcile', self.get_url('branch')])
 
83
        # This figure represent the amount of work to perform this use case. It
 
84
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
85
        # being too low. If rpc_count increases, more network roundtrips have
 
86
        # become necessary for this use case. Please do not adjust this number
 
87
        # upwards without agreement from bzr's network support maintainers.
 
88
        self.assertLength(10, self.hpss_calls)