← 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: Ian Clatworthy
  • Date: 2009-01-19 02:24:15 UTC
  • mto: This revision was merged to the branch mainline in revision 3944.
  • Revision ID: ian.clatworthy@canonical.com-20090119022415-mo0mcfeiexfktgwt
apply jam's log --short fix (Ian Clatworthy)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
 
20
20
import bzrlib
21
21
import bzrlib.bzrdir as bzrdir
 
22
from bzrlib.inventory import Inventory
22
23
import bzrlib.repository as repository
23
24
from bzrlib.tests import TestCaseWithTransport
24
 
from bzrlib.tests.blackbox import TestUIFactory
 
25
from bzrlib.tests import TestUIFactory
25
26
from bzrlib.transport import get_transport
26
27
import bzrlib.ui as ui
27
28
 
40
41
 
41
42
    def test_trivial_reconcile(self):
42
43
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
43
 
        (out, err) = self.run_bzr_captured(['reconcile'])
44
 
        self.assertEqualDiff(out, "Reconciling repository %s\n"
45
 
                                  "Inventory ok.\n"
 
44
        (out, err) = self.run_bzr('reconcile')
 
45
        if t.branch.repository._reconcile_backsup_inventory:
 
46
            does_backup_text = "Inventory ok.\n"
 
47
        else:
 
48
            does_backup_text = ""
 
49
        self.assertEqualDiff(out, "Reconciling branch %s\n"
 
50
                                  "revision_history ok.\n"
 
51
                                  "Reconciling repository %s\n"
 
52
                                  "%s"
46
53
                                  "Reconciliation complete.\n" %
47
 
                                  t.bzrdir.root_transport.base)
 
54
                                  (t.branch.base,
 
55
                                   t.bzrdir.root_transport.base,
 
56
                                   does_backup_text))
48
57
        self.assertEqualDiff(err, "")
49
58
 
50
59
    def test_does_something_reconcile(self):
51
60
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
52
61
        # an empty inventory with no revision will trigger reconciliation.
53
62
        repo = t.branch.repository
54
 
        inv = bzrlib.tree.EmptyTree().inventory
 
63
        inv = Inventory(revision_id='missing')
 
64
        inv.root.revision='missing'
 
65
        repo.lock_write()
 
66
        repo.start_write_group()
55
67
        repo.add_inventory('missing', inv, [])
56
 
        (out, err) = self.run_bzr_captured(['reconcile'])
57
 
        self.assertEqualDiff(out, "Reconciling repository %s\n"
58
 
                                  "Backup Inventory created.\n"
59
 
                                  "Inventory regenerated.\n"
60
 
                                  "Reconciliation complete.\n" %
61
 
                                  t.bzrdir.root_transport.base)
 
68
        repo.commit_write_group()
 
69
        repo.unlock()
 
70
        (out, err) = self.run_bzr('reconcile')
 
71
        if repo._reconcile_backsup_inventory:
 
72
            does_backup_text = (
 
73
                "Backup Inventory created.\n"
 
74
                "Inventory regenerated.\n")
 
75
        else:
 
76
            does_backup_text = ""
 
77
        expected = ("Reconciling branch %s\n"
 
78
                    "revision_history ok.\n"
 
79
                    "Reconciling repository %s\n"
 
80
                    "%s"
 
81
                    "Reconciliation complete.\n" %
 
82
                    (t.branch.base,
 
83
                     t.bzrdir.root_transport.base,
 
84
                     does_backup_text))
 
85
        self.assertEqualDiff(expected, out)
62
86
        self.assertEqualDiff(err, "")