/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.15 by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt
1
# Copyright (C) 2006, 2008-2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
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.11 by Robert Collins
Make reconcile work with shared repositories.
16
17
"""Tests for reconiliation behaviour that is repository independent."""
18
19
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
20
from breezy import (
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
21
    errors,
22
    tests,
23
    )
6670.4.1 by Jelmer Vernooij
Update imports.
24
from breezy.bzr import (
25
    bzrdir,
26
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
27
from breezy.reconcile import reconcile, Reconciler
28
from breezy.tests import per_repository
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
29
30
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
31
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
32
33
    def test_reweave_empty(self):
34
        # we want a repo capable format
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
35
        parent = bzrdir.BzrDirMetaFormat1().initialize('.')
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
36
        parent.create_repository(shared=True)
37
        parent.root_transport.mkdir('child')
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
38
        child = bzrdir.BzrDirMetaFormat1().initialize('child')
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
39
        self.assertRaises(errors.NoRepositoryPresent, child.open_repository)
40
        reconciler = Reconciler(child)
7206.6.4 by Jelmer Vernooij
Move reconcile logic to breezy.bzr.reconcile.
41
        result = reconciler.reconcile()
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
42
        # smoke test for reconcile appears to work too.
43
        reconcile(child)
44
        # no inconsistent parents should have been found
45
        # but the values should have been set.
7206.6.4 by Jelmer Vernooij
Move reconcile logic to breezy.bzr.reconcile.
46
        self.assertEqual(0, result.inconsistent_parents)
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
47
        # and no garbage inventories
7206.6.4 by Jelmer Vernooij
Move reconcile logic to breezy.bzr.reconcile.
48
        self.assertEqual(0, result.garbage_inventories)
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
49
50
51
class TestReconciler(tests.TestCaseWithTransport):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
52
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
53
    def test_reconciler_with_no_branch(self):
54
        repo = self.make_repository('repo')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
55
        reconciler = Reconciler(repo.controldir)
7206.6.4 by Jelmer Vernooij
Move reconcile logic to breezy.bzr.reconcile.
56
        result = reconciler.reconcile()
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
57
        # no inconsistent parents should have been found
58
        # but the values should have been set.
7206.6.4 by Jelmer Vernooij
Move reconcile logic to breezy.bzr.reconcile.
59
        self.assertEqual(0, result.inconsistent_parents)
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
60
        # and no garbage inventories
7206.6.4 by Jelmer Vernooij
Move reconcile logic to breezy.bzr.reconcile.
61
        self.assertEqual(0, result.garbage_inventories)
62
        self.assertIs(None, result.fixed_branch_history)
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
63
64
    def test_reconciler_finds_branch(self):
65
        a_branch = self.make_branch('a_branch')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
66
        reconciler = Reconciler(a_branch.controldir)
7206.6.4 by Jelmer Vernooij
Move reconcile logic to breezy.bzr.reconcile.
67
        result = reconciler.reconcile()
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
68
69
        # It should have checked the repository, and the branch
7206.6.4 by Jelmer Vernooij
Move reconcile logic to breezy.bzr.reconcile.
70
        self.assertEqual(0, result.inconsistent_parents)
71
        self.assertEqual(0, result.garbage_inventories)
72
        self.assertIs(False, result.fixed_branch_history)