/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: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_reconcile.py
21
21
    controldir,
22
22
    tests,
23
23
    )
 
24
from breezy.repository import WriteGroup
24
25
from breezy.bzr import (
25
26
    inventory,
26
27
    )
50
51
        t = controldir.ControlDir.create_standalone_workingtree('.')
51
52
        # an empty inventory with no revision will trigger reconciliation.
52
53
        repo = t.branch.repository
53
 
        inv = inventory.Inventory(revision_id='missing')
54
 
        inv.root.revision='missing'
 
54
        inv = inventory.Inventory(revision_id=b'missing')
 
55
        inv.root.revision = b'missing'
55
56
        repo.lock_write()
56
 
        repo.start_write_group()
57
 
        repo.add_inventory('missing', inv, [])
58
 
        repo.commit_write_group()
59
 
        repo.unlock()
 
57
        with repo.lock_write(), WriteGroup(repo):
 
58
            repo.add_inventory(b'missing', inv, [])
60
59
        (out, err) = self.run_bzr('reconcile')
61
60
        if repo._reconcile_backsup_inventory:
62
61
            does_backup_text = (