|
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 |
||
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
20 |
from bzrlib import ( |
21 |
bzrdir, |
|
22 |
errors, |
|
23 |
tests, |
|
24 |
)
|
|
|
1570.1.11
by Robert Collins
Make reconcile work with shared repositories. |
25 |
from bzrlib.reconcile import reconcile, Reconciler |
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
26 |
from bzrlib.tests import per_repository |
|
1570.1.11
by Robert Collins
Make reconcile work with shared repositories. |
27 |
|
28 |
||
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
29 |
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository): |
|
1570.1.11
by Robert Collins
Make reconcile work with shared repositories. |
30 |
|
31 |
def test_reweave_empty(self): |
|
32 |
# we want a repo capable format
|
|
|
3389.2.3
by John Arbash Meinel
Add Branch.reconcile() functionality. |
33 |
parent = bzrdir.BzrDirMetaFormat1().initialize('.') |
|
1570.1.11
by Robert Collins
Make reconcile work with shared repositories. |
34 |
parent.create_repository(shared=True) |
35 |
parent.root_transport.mkdir('child') |
|
|
3389.2.3
by John Arbash Meinel
Add Branch.reconcile() functionality. |
36 |
child = bzrdir.BzrDirMetaFormat1().initialize('child') |
|
1570.1.11
by Robert Collins
Make reconcile work with shared repositories. |
37 |
self.assertRaises(errors.NoRepositoryPresent, child.open_repository) |
38 |
reconciler = Reconciler(child) |
|
39 |
reconciler.reconcile() |
|
40 |
# smoke test for reconcile appears to work too.
|
|
41 |
reconcile(child) |
|
42 |
# no inconsistent parents should have been found
|
|
43 |
# but the values should have been set.
|
|
44 |
self.assertEqual(0, reconciler.inconsistent_parents) |
|
45 |
# and no garbage inventories
|
|
46 |
self.assertEqual(0, reconciler.garbage_inventories) |
|
|
3389.2.3
by John Arbash Meinel
Add Branch.reconcile() functionality. |
47 |
|
48 |
||
49 |
class TestReconciler(tests.TestCaseWithTransport): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
50 |
|
|
3389.2.3
by John Arbash Meinel
Add Branch.reconcile() functionality. |
51 |
def test_reconciler_with_no_branch(self): |
52 |
repo = self.make_repository('repo') |
|
53 |
reconciler = Reconciler(repo.bzrdir) |
|
|
3389.2.8
by John Arbash Meinel
Update some tests to pass with the branch checks. |
54 |
reconciler.reconcile() |
|
3389.2.3
by John Arbash Meinel
Add Branch.reconcile() functionality. |
55 |
# no inconsistent parents should have been found
|
56 |
# but the values should have been set.
|
|
57 |
self.assertEqual(0, reconciler.inconsistent_parents) |
|
58 |
# and no garbage inventories
|
|
59 |
self.assertEqual(0, reconciler.garbage_inventories) |
|
|
3389.2.8
by John Arbash Meinel
Update some tests to pass with the branch checks. |
60 |
self.assertIs(None, reconciler.fixed_branch_history) |
|
3389.2.3
by John Arbash Meinel
Add Branch.reconcile() functionality. |
61 |
|
62 |
def test_reconciler_finds_branch(self): |
|
63 |
a_branch = self.make_branch('a_branch') |
|
64 |
reconciler = Reconciler(a_branch.bzrdir) |
|
|
3389.2.8
by John Arbash Meinel
Update some tests to pass with the branch checks. |
65 |
reconciler.reconcile() |
|
3389.2.3
by John Arbash Meinel
Add Branch.reconcile() functionality. |
66 |
|
67 |
# It should have checked the repository, and the branch
|
|
68 |
self.assertEqual(0, reconciler.inconsistent_parents) |
|
69 |
self.assertEqual(0, reconciler.garbage_inventories) |
|
70 |
self.assertIs(False, reconciler.fixed_branch_history) |