← 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: Robert Collins
  • Date: 2006-02-26 07:54:02 UTC
  • mto: (1587.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1588.
  • Revision ID: robertc@robertcollins.net-20060226075402-92fca9fdb7b0070d
Check for incorrect revision parentage in the weave during revision access.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006 by 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
19
19
 
20
20
import bzrlib
21
21
import bzrlib.bzrdir as bzrdir
22
 
from bzrlib.inventory import Inventory
23
22
import bzrlib.repository as repository
24
23
from bzrlib.tests import TestCaseWithTransport
25
 
from bzrlib.tests import TestUIFactory
 
24
from bzrlib.tests.blackbox import TestUIFactory
26
25
from bzrlib.transport import get_transport
27
26
import bzrlib.ui as ui
28
27
 
41
40
 
42
41
    def test_trivial_reconcile(self):
43
42
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
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"
 
43
        (out, err) = self.run_bzr_captured(['reconcile'])
 
44
        self.assertEqualDiff(out, "Reconciling repository %s\n"
 
45
                                  "Inventory ok.\n"
53
46
                                  "Reconciliation complete.\n" %
54
 
                                  (t.branch.base,
55
 
                                   t.bzrdir.root_transport.base,
56
 
                                   does_backup_text))
 
47
                                  t.bzrdir.root_transport.base)
57
48
        self.assertEqualDiff(err, "")
58
49
 
59
50
    def test_does_something_reconcile(self):
60
51
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
61
52
        # an empty inventory with no revision will trigger reconciliation.
62
53
        repo = t.branch.repository
63
 
        inv = Inventory(revision_id='missing')
64
 
        inv.root.revision='missing'
65
 
        repo.lock_write()
66
 
        repo.start_write_group()
 
54
        inv = bzrlib.tree.EmptyTree().inventory
67
55
        repo.add_inventory('missing', inv, [])
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)
 
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)
86
62
        self.assertEqualDiff(err, "")
 
63