← 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: 2006-06-15 05:36:34 UTC
  • mto: This revision was merged to the branch mainline in revision 1797.
  • Revision ID: mbp@sourcefrog.net-20060615053634-4fd52ba691855659
Clean up many exception classes.

Errors indicating a user error are now shown with is_user_error on the
exception; use this rather than hardcoding a list of exceptions that should be
handled this way.

Exceptions now inherit from BzrNewException where possible to use consistent
formatting method.

Remove rather obsolete docstring test on Branch.missing_revisions.

Remove dead code from find_merge_base.


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
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
 
17
"""Black box tests for the reconcile command."""
 
18
 
 
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
 
40
 
 
41
    def test_trivial_reconcile(self):
 
42
        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"
 
46
                                  "Reconciliation complete.\n" %
 
47
                                  t.bzrdir.root_transport.base)
 
48
        self.assertEqualDiff(err, "")
 
49
 
 
50
    def test_does_something_reconcile(self):
 
51
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
52
        # an empty inventory with no revision will trigger reconciliation.
 
53
        repo = t.branch.repository
 
54
        inv = bzrlib.tree.EmptyTree().inventory
 
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)
 
62
        self.assertEqualDiff(err, "")