/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: John Arbash Meinel
  • Date: 2006-04-25 15:05:42 UTC
  • mfrom: (1185.85.85 bzr-encoding)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060425150542-c7b518dca9928691
[merge] the old bzr-encoding changes, reparenting them on bzr.dev

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
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Black box tests for the reconcile command."""
18
18
 
19
19
 
20
 
from breezy import (
21
 
    controldir,
22
 
    tests,
23
 
    )
24
 
from breezy.repository import WriteGroup
25
 
from breezy.bzr import (
26
 
    inventory,
27
 
    )
28
 
from breezy.tests.matchers import ContainsNoVfsCalls
29
 
 
30
 
 
31
 
class TrivialTest(tests.TestCaseWithTransport):
 
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
32
40
 
33
41
    def test_trivial_reconcile(self):
34
 
        t = controldir.ControlDir.create_standalone_workingtree('.')
35
 
        (out, err) = self.run_bzr('reconcile')
36
 
        if t.branch.repository._reconcile_backsup_inventory:
37
 
            does_backup_text = "Inventory ok.\n"
38
 
        else:
39
 
            does_backup_text = ""
40
 
        self.assertEqualDiff(out, "Reconciling branch %s\n"
41
 
                                  "revision_history ok.\n"
42
 
                                  "Reconciling repository %s\n"
43
 
                                  "%s"
 
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"
44
46
                                  "Reconciliation complete.\n" %
45
 
                                  (t.branch.base,
46
 
                                   t.controldir.root_transport.base,
47
 
                                   does_backup_text))
 
47
                                  t.bzrdir.root_transport.base)
48
48
        self.assertEqualDiff(err, "")
49
49
 
50
50
    def test_does_something_reconcile(self):
51
 
        t = controldir.ControlDir.create_standalone_workingtree('.')
 
51
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
52
52
        # an empty inventory with no revision will trigger reconciliation.
53
53
        repo = t.branch.repository
54
 
        inv = inventory.Inventory(revision_id=b'missing')
55
 
        inv.root.revision = b'missing'
56
 
        repo.lock_write()
57
 
        with repo.lock_write(), WriteGroup(repo):
58
 
            repo.add_inventory(b'missing', inv, [])
59
 
        (out, err) = self.run_bzr('reconcile')
60
 
        if repo._reconcile_backsup_inventory:
61
 
            does_backup_text = (
62
 
                "Backup Inventory created.\n"
63
 
                "Inventory regenerated.\n")
64
 
        else:
65
 
            does_backup_text = ""
66
 
        expected = ("Reconciling branch %s\n"
67
 
                    "revision_history ok.\n"
68
 
                    "Reconciling repository %s\n"
69
 
                    "%s"
70
 
                    "Reconciliation complete.\n" %
71
 
                    (t.branch.base,
72
 
                     t.controldir.root_transport.base,
73
 
                     does_backup_text))
74
 
        self.assertEqualDiff(expected, out)
 
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)
75
62
        self.assertEqualDiff(err, "")
76
63
 
77
 
 
78
 
class TestSmartServerReconcile(tests.TestCaseWithTransport):
79
 
 
80
 
    def test_simple_reconcile(self):
81
 
        self.setup_smart_server_with_call_log()
82
 
        self.make_branch('branch')
83
 
        self.reset_smart_call_log()
84
 
        out, err = self.run_bzr(['reconcile', self.get_url('branch')])
85
 
        # This figure represent the amount of work to perform this use case. It
86
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
87
 
        # being too low. If rpc_count increases, more network roundtrips have
88
 
        # become necessary for this use case. Please do not adjust this number
89
 
        # upwards without agreement from bzr's network support maintainers.
90
 
        self.assertLength(10, self.hpss_calls)
91
 
        self.assertLength(1, self.hpss_connections)
92
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)