~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-10-13 00:26:41 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101013002641-9tlh9k89mlj1666m
Keep docs-plain working.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
from bzrlib import (
21
21
    bzrdir,
22
22
    inventory,
 
23
    repository,
23
24
    tests,
24
25
    )
25
26
 
71
72
                     does_backup_text))
72
73
        self.assertEqualDiff(expected, out)
73
74
        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)