/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2006 Canonical Ltd
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
2
#
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
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.
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
7
#
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
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.
1570.1.7 by Robert Collins
Replace the slow topo_sort routine with a much faster one for non trivial datasets.
12
#
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
16
17
"""Black box tests for the reconcile command."""
18
19
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
20
from breezy import (
6472.2.2 by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places.
21
    controldir,
6670.4.3 by Jelmer Vernooij
Fix more imports.
22
    tests,
23
    )
24
from breezy.bzr import (
4985.1.5 by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity
25
    inventory,
26
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
27
from breezy.tests.matchers import ContainsNoVfsCalls
4985.1.5 by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity
28
29
30
class TrivialTest(tests.TestCaseWithTransport):
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
31
32
    def test_trivial_reconcile(self):
6472.2.2 by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places.
33
        t = controldir.ControlDir.create_standalone_workingtree('.')
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
34
        (out, err) = self.run_bzr('reconcile')
3010.1.14 by Robert Collins
Handle packs in blackbox.test_reconcile.
35
        if t.branch.repository._reconcile_backsup_inventory:
36
            does_backup_text = "Inventory ok.\n"
37
        else:
38
            does_backup_text = ""
3389.2.8 by John Arbash Meinel
Update some tests to pass with the branch checks.
39
        self.assertEqualDiff(out, "Reconciling branch %s\n"
40
                                  "revision_history ok.\n"
41
                                  "Reconciling repository %s\n"
3010.1.14 by Robert Collins
Handle packs in blackbox.test_reconcile.
42
                                  "%s"
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
43
                                  "Reconciliation complete.\n" %
3389.2.8 by John Arbash Meinel
Update some tests to pass with the branch checks.
44
                                  (t.branch.base,
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
45
                                   t.controldir.root_transport.base,
3010.1.14 by Robert Collins
Handle packs in blackbox.test_reconcile.
46
                                   does_backup_text))
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
47
        self.assertEqualDiff(err, "")
48
49
    def test_does_something_reconcile(self):
6472.2.2 by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places.
50
        t = controldir.ControlDir.create_standalone_workingtree('.')
1570.1.8 by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry.
51
        # an empty inventory with no revision will trigger reconciliation.
52
        repo = t.branch.repository
4985.1.5 by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity
53
        inv = inventory.Inventory(revision_id='missing')
1910.2.37 by Aaron Bentley
Handle empty commits, fix test
54
        inv.root.revision='missing'
2592.3.148 by Robert Collins
Remove singly-used call_in_write_group Repository helper method.
55
        repo.lock_write()
56
        repo.start_write_group()
57
        repo.add_inventory('missing', inv, [])
58
        repo.commit_write_group()
59
        repo.unlock()
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
60
        (out, err) = self.run_bzr('reconcile')
3010.1.14 by Robert Collins
Handle packs in blackbox.test_reconcile.
61
        if repo._reconcile_backsup_inventory:
62
            does_backup_text = (
63
                "Backup Inventory created.\n"
64
                "Inventory regenerated.\n")
65
        else:
66
            does_backup_text = ""
3389.2.8 by John Arbash Meinel
Update some tests to pass with the branch checks.
67
        expected = ("Reconciling branch %s\n"
68
                    "revision_history ok.\n"
69
                    "Reconciling repository %s\n"
3010.1.14 by Robert Collins
Handle packs in blackbox.test_reconcile.
70
                    "%s"
71
                    "Reconciliation complete.\n" %
3389.2.8 by John Arbash Meinel
Update some tests to pass with the branch checks.
72
                    (t.branch.base,
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
73
                     t.controldir.root_transport.base,
3389.2.8 by John Arbash Meinel
Update some tests to pass with the branch checks.
74
                     does_backup_text))
3010.1.14 by Robert Collins
Handle packs in blackbox.test_reconcile.
75
        self.assertEqualDiff(expected, out)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
76
        self.assertEqualDiff(err, "")
6300.1.4 by Jelmer Vernooij
Add reconcile results.
77
78
79
class TestSmartServerReconcile(tests.TestCaseWithTransport):
80
81
    def test_simple_reconcile(self):
82
        self.setup_smart_server_with_call_log()
83
        self.make_branch('branch')
84
        self.reset_smart_call_log()
85
        out, err = self.run_bzr(['reconcile', self.get_url('branch')])
86
        # This figure represent the amount of work to perform this use case. It
87
        # is entirely ok to reduce this number if a test fails due to rpc_count
88
        # being too low. If rpc_count increases, more network roundtrips have
89
        # become necessary for this use case. Please do not adjust this number
90
        # upwards without agreement from bzr's network support maintainers.
6300.1.8 by Jelmer Vernooij
Cope with lock_write call.
91
        self.assertLength(10, self.hpss_calls)
6366.1.4 by Jelmer Vernooij
Test connection count calls for most blackbox commands.
92
        self.assertLength(1, self.hpss_connections)
93
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)