← 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: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

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
    )
 
25
from bzrlib.tests.matchers import ContainsNoVfsCalls
26
26
 
27
27
 
28
28
class TrivialTest(tests.TestCaseWithTransport):
72
72
                     does_backup_text))
73
73
        self.assertEqualDiff(expected, out)
74
74
        self.assertEqualDiff(err, "")
 
75
 
 
76
 
 
77
class TestSmartServerReconcile(tests.TestCaseWithTransport):
 
78
 
 
79
    def test_simple_reconcile(self):
 
80
        self.setup_smart_server_with_call_log()
 
81
        self.make_branch('branch')
 
82
        self.reset_smart_call_log()
 
83
        out, err = self.run_bzr(['reconcile', self.get_url('branch')])
 
84
        # This figure represent the amount of work to perform this use case. It
 
85
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
86
        # being too low. If rpc_count increases, more network roundtrips have
 
87
        # become necessary for this use case. Please do not adjust this number
 
88
        # upwards without agreement from bzr's network support maintainers.
 
89
        self.assertLength(10, self.hpss_calls)
 
90
        self.assertLength(1, self.hpss_connections)
 
91
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)