← 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

Major code cleanup.

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
 
19
19
 
20
 
import bzrlib
21
 
import bzrlib.bzrdir as bzrdir
22
 
import bzrlib.repository as repository
23
 
from bzrlib.tests import TestCaseWithTransport
24
 
from bzrlib.tests.blackbox import TestUIFactory
25
 
from bzrlib.transport import get_transport
26
 
import bzrlib.ui as ui
27
 
 
28
 
 
29
 
class TrivialTest(TestCaseWithTransport):
30
 
 
31
 
    def setUp(self):
32
 
        super(TrivialTest, self).setUp()
33
 
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
34
 
        self.old_ui_factory = ui.ui_factory
35
 
        self.addCleanup(self.restoreDefaults)
36
 
        ui.ui_factory = TestUIFactory()
37
 
 
38
 
    def restoreDefaults(self):
39
 
        ui.ui_factory = self.old_ui_factory
 
20
from bzrlib import (
 
21
    bzrdir,
 
22
    inventory,
 
23
    repository,
 
24
    tests,
 
25
    )
 
26
 
 
27
 
 
28
class TrivialTest(tests.TestCaseWithTransport):
40
29
 
41
30
    def test_trivial_reconcile(self):
42
31
        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"
 
32
        (out, err) = self.run_bzr('reconcile')
 
33
        if t.branch.repository._reconcile_backsup_inventory:
 
34
            does_backup_text = "Inventory ok.\n"
 
35
        else:
 
36
            does_backup_text = ""
 
37
        self.assertEqualDiff(out, "Reconciling branch %s\n"
 
38
                                  "revision_history ok.\n"
 
39
                                  "Reconciling repository %s\n"
 
40
                                  "%s"
46
41
                                  "Reconciliation complete.\n" %
47
 
                                  t.bzrdir.root_transport.base)
 
42
                                  (t.branch.base,
 
43
                                   t.bzrdir.root_transport.base,
 
44
                                   does_backup_text))
48
45
        self.assertEqualDiff(err, "")
49
46
 
50
47
    def test_does_something_reconcile(self):
51
48
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
52
49
        # an empty inventory with no revision will trigger reconciliation.
53
50
        repo = t.branch.repository
54
 
        inv = bzrlib.tree.EmptyTree().inventory
 
51
        inv = inventory.Inventory(revision_id='missing')
 
52
        inv.root.revision='missing'
 
53
        repo.lock_write()
 
54
        repo.start_write_group()
55
55
        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)
 
56
        repo.commit_write_group()
 
57
        repo.unlock()
 
58
        (out, err) = self.run_bzr('reconcile')
 
59
        if repo._reconcile_backsup_inventory:
 
60
            does_backup_text = (
 
61
                "Backup Inventory created.\n"
 
62
                "Inventory regenerated.\n")
 
63
        else:
 
64
            does_backup_text = ""
 
65
        expected = ("Reconciling branch %s\n"
 
66
                    "revision_history ok.\n"
 
67
                    "Reconciling repository %s\n"
 
68
                    "%s"
 
69
                    "Reconciliation complete.\n" %
 
70
                    (t.branch.base,
 
71
                     t.bzrdir.root_transport.base,
 
72
                     does_backup_text))
 
73
        self.assertEqualDiff(expected, out)
62
74
        self.assertEqualDiff(err, "")
63