← 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: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
22
22
from bzrlib.inventory import Inventory
23
23
import bzrlib.repository as repository
24
24
from bzrlib.tests import TestCaseWithTransport
25
 
from bzrlib.tests import TestUIFactory
 
25
from bzrlib.tests.blackbox import TestUIFactory
26
26
from bzrlib.transport import get_transport
27
27
import bzrlib.ui as ui
28
28
 
41
41
 
42
42
    def test_trivial_reconcile(self):
43
43
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
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"
 
44
        (out, err) = self.run_bzr_captured(['reconcile'])
 
45
        self.assertEqualDiff(out, "Reconciling repository %s\n"
 
46
                                  "Inventory ok.\n"
53
47
                                  "Reconciliation complete.\n" %
54
 
                                  (t.branch.base,
55
 
                                   t.bzrdir.root_transport.base,
56
 
                                   does_backup_text))
 
48
                                  t.bzrdir.root_transport.base)
57
49
        self.assertEqualDiff(err, "")
58
50
 
59
51
    def test_does_something_reconcile(self):
62
54
        repo = t.branch.repository
63
55
        inv = Inventory(revision_id='missing')
64
56
        inv.root.revision='missing'
65
 
        repo.lock_write()
66
 
        repo.start_write_group()
67
57
        repo.add_inventory('missing', inv, [])
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)
 
58
        (out, err) = self.run_bzr_captured(['reconcile'])
 
59
        self.assertEqualDiff(out, "Reconciling repository %s\n"
 
60
                                  "Backup Inventory created.\n"
 
61
                                  "Inventory regenerated.\n"
 
62
                                  "Reconciliation complete.\n" %
 
63
                                  t.bzrdir.root_transport.base)
86
64
        self.assertEqualDiff(err, "")