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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-19 22:18:01 UTC
  • mfrom: (7515.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200619221801-6chb6w22ctckkajl
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/386125

Show diffs side-by-side

added added

removed removed

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