/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 bzrlib/tests/blackbox/test_reconcile.py

  • Committer: Robert Collins
  • Date: 2006-02-23 04:08:56 UTC
  • mto: (1587.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1588.
  • Revision ID: robertc@robertcollins.net-20060223040856-8b476741783b6244
Import bzrtools' 'fix' command as 'bzr reconcile.'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
1
 
# Copyright (C) 2006 Canonical Ltd
2
 
#
 
1
# Copyright (C) 2006 by Canonical Ltd
 
2
# Authors: Robert Collins <robert.collins@canonical.com>
 
3
# -*- coding: utf-8 -*-
 
4
 
3
5
# This program is free software; you can redistribute it and/or modify
4
6
# it under the terms of the GNU General Public License as published by
5
7
# the Free Software Foundation; either version 2 of the License, or
6
8
# (at your option) any later version.
7
 
#
 
9
 
8
10
# This program is distributed in the hope that it will be useful,
9
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
13
# GNU General Public License for more details.
12
 
#
 
14
 
13
15
# You should have received a copy of the GNU General Public License
14
16
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
18
 
17
19
"""Black box tests for the reconcile command."""
18
20
 
19
21
 
20
 
from bzrlib import (
21
 
    bzrdir,
22
 
    inventory,
23
 
    repository,
24
 
    tests,
25
 
    )
26
 
 
27
 
 
28
 
class TrivialTest(tests.TestCaseWithTransport):
 
22
import bzrlib.bzrdir as bzrdir
 
23
import bzrlib.repository as repository
 
24
from bzrlib.tests import TestCaseWithTransport
 
25
from bzrlib.tests.blackbox import TestUIFactory
 
26
from bzrlib.transport import get_transport
 
27
import bzrlib.ui as ui
 
28
 
 
29
 
 
30
class TrivialTest(TestCaseWithTransport):
 
31
 
 
32
    def setUp(self):
 
33
        super(TrivialTest, self).setUp()
 
34
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
 
35
        self.old_ui_factory = ui.ui_factory
 
36
        self.addCleanup(self.restoreDefaults)
 
37
        ui.ui_factory = TestUIFactory()
 
38
 
 
39
    def restoreDefaults(self):
 
40
        ui.ui_factory = self.old_ui_factory
29
41
 
30
42
    def test_trivial_reconcile(self):
31
43
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
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"
 
44
        (out, err) = self.run_bzr_captured(['reconcile'])
 
45
        self.assertEqualDiff(out, "Reconciling repository %s\n"
 
46
                                  "Backup Inventory created.\n"
 
47
                                  "Inventory regenerated.\n"
41
48
                                  "Reconciliation complete.\n" %
42
 
                                  (t.branch.base,
43
 
                                   t.bzrdir.root_transport.base,
44
 
                                   does_backup_text))
 
49
                                  t.bzrdir.root_transport.base)
45
50
        self.assertEqualDiff(err, "")
46
51
 
47
 
    def test_does_something_reconcile(self):
48
 
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
49
 
        # an empty inventory with no revision will trigger reconciliation.
50
 
        repo = t.branch.repository
51
 
        inv = inventory.Inventory(revision_id='missing')
52
 
        inv.root.revision='missing'
53
 
        repo.lock_write()
54
 
        repo.start_write_group()
55
 
        repo.add_inventory('missing', inv, [])
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)
74
 
        self.assertEqualDiff(err, "")