← 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: Martin Pool
  • Date: 2009-08-20 04:53:23 UTC
  • mto: This revision was merged to the branch mainline in revision 4632.
  • Revision ID: mbp@sourcefrog.net-20090820045323-4hsicfa87pdq3l29
Correction to xdg_cache_dir and add a simple test

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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Black box tests for the reconcile command."""
18
18
 
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.blackbox import TestUIFactory
 
25
from bzrlib.tests 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_captured(['reconcile'])
45
 
        self.assertEqualDiff(out, "Reconciling repository %s\n"
46
 
                                  "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"
47
53
                                  "Reconciliation complete.\n" %
48
 
                                  t.bzrdir.root_transport.base)
 
54
                                  (t.branch.base,
 
55
                                   t.bzrdir.root_transport.base,
 
56
                                   does_backup_text))
49
57
        self.assertEqualDiff(err, "")
50
58
 
51
59
    def test_does_something_reconcile(self):
52
60
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
53
61
        # an empty inventory with no revision will trigger reconciliation.
54
62
        repo = t.branch.repository
55
 
        inv = Inventory()
 
63
        inv = Inventory(revision_id='missing')
 
64
        inv.root.revision='missing'
 
65
        repo.lock_write()
 
66
        repo.start_write_group()
56
67
        repo.add_inventory('missing', inv, [])
57
 
        (out, err) = self.run_bzr_captured(['reconcile'])
58
 
        self.assertEqualDiff(out, "Reconciling repository %s\n"
59
 
                                  "Backup Inventory created.\n"
60
 
                                  "Inventory regenerated.\n"
61
 
                                  "Reconciliation complete.\n" %
62
 
                                  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)
63
86
        self.assertEqualDiff(err, "")