← 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: 2005-04-15 09:33:28 UTC
  • Revision ID: mbp@sourcefrog.net-20050415093328-94d142b1130b3d2c
- Better workaround for trailing newlines in diffs

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
 
#
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
"""Black box tests for the reconcile command."""
18
 
 
19
 
 
20
 
from bzrlib import (
21
 
    bzrdir,
22
 
    inventory,
23
 
    repository,
24
 
    tests,
25
 
    )
26
 
 
27
 
 
28
 
class TrivialTest(tests.TestCaseWithTransport):
29
 
 
30
 
    def test_trivial_reconcile(self):
31
 
        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"
41
 
                                  "Reconciliation complete.\n" %
42
 
                                  (t.branch.base,
43
 
                                   t.bzrdir.root_transport.base,
44
 
                                   does_backup_text))
45
 
        self.assertEqualDiff(err, "")
46
 
 
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, "")