/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): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

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 (
 
20
from breezy import (
21
21
    controldir,
 
22
    tests,
 
23
    )
 
24
from breezy.repository import WriteGroup
 
25
from breezy.bzr import (
22
26
    inventory,
23
 
    tests,
24
27
    )
25
 
from bzrlib.tests.matchers import ContainsNoVfsCalls
26
28
 
27
29
 
28
30
class TrivialTest(tests.TestCaseWithTransport):
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
 
48
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
 
        repo.start_write_group()
55
 
        repo.add_inventory('missing', inv, [])
56
 
        repo.commit_write_group()
57
 
        repo.unlock()
 
56
        with repo.lock_write(), WriteGroup(repo):
 
57
            repo.add_inventory(b'missing', inv, [])
58
58
        (out, err) = self.run_bzr('reconcile')
59
59
        if repo._reconcile_backsup_inventory:
60
60
            does_backup_text = (
68
68
                    "%s"
69
69
                    "Reconciliation complete.\n" %
70
70
                    (t.branch.base,
71
 
                     t.bzrdir.root_transport.base,
 
71
                     t.controldir.root_transport.base,
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)