← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
18
18
 
19
19
 
20
20
from bzrlib import (
21
 
    bzrdir,
 
21
    controldir,
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):
29
29
 
30
30
    def test_trivial_reconcile(self):
31
 
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
31
        t = controldir.ControlDir.create_standalone_workingtree('.')
32
32
        (out, err) = self.run_bzr('reconcile')
33
33
        if t.branch.repository._reconcile_backsup_inventory:
34
34
            does_backup_text = "Inventory ok.\n"
45
45
        self.assertEqualDiff(err, "")
46
46
 
47
47
    def test_does_something_reconcile(self):
48
 
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
48
        t = controldir.ControlDir.create_standalone_workingtree('.')
49
49
        # an empty inventory with no revision will trigger reconciliation.
50
50
        repo = t.branch.repository
51
51
        inv = inventory.Inventory(revision_id='missing')
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)