← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-12 13:44:20 UTC
  • mfrom: (6358 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6362.
  • Revision ID: jelmer@samba.org-20111212134420-20130h4aa5ewp2m7
Merge bzr.dev.

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)