/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: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_reconcile.py
17
17
"""Black box tests for the reconcile command."""
18
18
 
19
19
 
20
 
from bzrlib import (
21
 
    bzrdir,
 
20
from breezy import (
 
21
    controldir,
 
22
    tests,
 
23
    )
 
24
from breezy.bzr import (
22
25
    inventory,
23
 
    repository,
24
 
    tests,
25
26
    )
 
27
from breezy.tests.matchers import ContainsNoVfsCalls
26
28
 
27
29
 
28
30
class TrivialTest(tests.TestCaseWithTransport):
29
31
 
30
32
    def test_trivial_reconcile(self):
31
 
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
33
        t = controldir.ControlDir.create_standalone_workingtree('.')
32
34
        (out, err) = self.run_bzr('reconcile')
33
35
        if t.branch.repository._reconcile_backsup_inventory:
34
36
            does_backup_text = "Inventory ok.\n"
40
42
                                  "%s"
41
43
                                  "Reconciliation complete.\n" %
42
44
                                  (t.branch.base,
43
 
                                   t.bzrdir.root_transport.base,
 
45
                                   t.controldir.root_transport.base,
44
46
                                   does_backup_text))
45
47
        self.assertEqualDiff(err, "")
46
48
 
47
49
    def test_does_something_reconcile(self):
48
 
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
50
        t = controldir.ControlDir.create_standalone_workingtree('.')
49
51
        # an empty inventory with no revision will trigger reconciliation.
50
52
        repo = t.branch.repository
51
 
        inv = inventory.Inventory(revision_id='missing')
52
 
        inv.root.revision='missing'
 
53
        inv = inventory.Inventory(revision_id=b'missing')
 
54
        inv.root.revision=b'missing'
53
55
        repo.lock_write()
54
56
        repo.start_write_group()
55
 
        repo.add_inventory('missing', inv, [])
 
57
        repo.add_inventory(b'missing', inv, [])
56
58
        repo.commit_write_group()
57
59
        repo.unlock()
58
60
        (out, err) = self.run_bzr('reconcile')
68
70
                    "%s"
69
71
                    "Reconciliation complete.\n" %
70
72
                    (t.branch.base,
71
 
                     t.bzrdir.root_transport.base,
 
73
                     t.controldir.root_transport.base,
72
74
                     does_backup_text))
73
75
        self.assertEqualDiff(expected, out)
74
76
        self.assertEqualDiff(err, "")
 
77
 
 
78
 
 
79
class TestSmartServerReconcile(tests.TestCaseWithTransport):
 
80
 
 
81
    def test_simple_reconcile(self):
 
82
        self.setup_smart_server_with_call_log()
 
83
        self.make_branch('branch')
 
84
        self.reset_smart_call_log()
 
85
        out, err = self.run_bzr(['reconcile', self.get_url('branch')])
 
86
        # This figure represent the amount of work to perform this use case. It
 
87
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
88
        # being too low. If rpc_count increases, more network roundtrips have
 
89
        # become necessary for this use case. Please do not adjust this number
 
90
        # upwards without agreement from bzr's network support maintainers.
 
91
        self.assertLength(10, self.hpss_calls)
 
92
        self.assertLength(1, self.hpss_connections)
 
93
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)