|
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
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""Black box tests for the reconcile command."""
|
|
18 |
||
19 |
||
|
1570.1.8
by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry. |
20 |
import bzrlib |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
21 |
import bzrlib.bzrdir as bzrdir |
|
1731.1.1
by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty |
22 |
from bzrlib.inventory import Inventory |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
23 |
import bzrlib.repository as repository |
24 |
from bzrlib.tests import TestCaseWithTransport |
|
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
25 |
from bzrlib.tests import TestUIFactory |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
26 |
from bzrlib.transport import get_transport |
27 |
import bzrlib.ui as ui |
|
28 |
||
29 |
||
30 |
class TrivialTest(TestCaseWithTransport): |
|
31 |
||
32 |
def setUp(self): |
|
33 |
super(TrivialTest, self).setUp() |
|
34 |
self.old_format = bzrdir.BzrDirFormat.get_default_format() |
|
35 |
self.old_ui_factory = ui.ui_factory |
|
36 |
self.addCleanup(self.restoreDefaults) |
|
37 |
ui.ui_factory = TestUIFactory() |
|
38 |
||
39 |
def restoreDefaults(self): |
|
40 |
ui.ui_factory = self.old_ui_factory |
|
41 |
||
42 |
def test_trivial_reconcile(self): |
|
43 |
t = bzrdir.BzrDir.create_standalone_workingtree('.') |
|
|
2552.2.2
by Vincent Ladeuil
Enforce run_bzr(string) where possible. |
44 |
(out, err) = self.run_bzr('reconcile') |
|
3010.1.14
by Robert Collins
Handle packs in blackbox.test_reconcile. |
45 |
if t.branch.repository._reconcile_backsup_inventory: |
46 |
does_backup_text = "Inventory ok.\n" |
|
47 |
else: |
|
48 |
does_backup_text = "" |
|
|
3389.2.8
by John Arbash Meinel
Update some tests to pass with the branch checks. |
49 |
self.assertEqualDiff(out, "Reconciling branch %s\n" |
50 |
"revision_history ok.\n" |
|
51 |
"Reconciling repository %s\n" |
|
|
3010.1.14
by Robert Collins
Handle packs in blackbox.test_reconcile. |
52 |
"%s" |
|
1570.1.8
by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry. |
53 |
"Reconciliation complete.\n" % |
|
3389.2.8
by John Arbash Meinel
Update some tests to pass with the branch checks. |
54 |
(t.branch.base, |
55 |
t.bzrdir.root_transport.base, |
|
|
3010.1.14
by Robert Collins
Handle packs in blackbox.test_reconcile. |
56 |
does_backup_text)) |
|
1570.1.8
by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry. |
57 |
self.assertEqualDiff(err, "") |
58 |
||
59 |
def test_does_something_reconcile(self): |
|
60 |
t = bzrdir.BzrDir.create_standalone_workingtree('.') |
|
61 |
# an empty inventory with no revision will trigger reconciliation.
|
|
62 |
repo = t.branch.repository |
|
|
1910.2.37
by Aaron Bentley
Handle empty commits, fix test |
63 |
inv = Inventory(revision_id='missing') |
64 |
inv.root.revision='missing' |
|
|
2592.3.148
by Robert Collins
Remove singly-used call_in_write_group Repository helper method. |
65 |
repo.lock_write() |
66 |
repo.start_write_group() |
|
67 |
repo.add_inventory('missing', inv, []) |
|
68 |
repo.commit_write_group() |
|
69 |
repo.unlock() |
|
|
2552.2.2
by Vincent Ladeuil
Enforce run_bzr(string) where possible. |
70 |
(out, err) = self.run_bzr('reconcile') |
|
3010.1.14
by Robert Collins
Handle packs in blackbox.test_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 = "" |
|
|
3389.2.8
by John Arbash Meinel
Update some tests to pass with the branch checks. |
77 |
expected = ("Reconciling branch %s\n" |
78 |
"revision_history ok.\n" |
|
79 |
"Reconciling repository %s\n" |
|
|
3010.1.14
by Robert Collins
Handle packs in blackbox.test_reconcile. |
80 |
"%s" |
81 |
"Reconciliation complete.\n" % |
|
|
3389.2.8
by John Arbash Meinel
Update some tests to pass with the branch checks. |
82 |
(t.branch.base, |
83 |
t.bzrdir.root_transport.base, |
|
84 |
does_backup_text)) |
|
|
3010.1.14
by Robert Collins
Handle packs in blackbox.test_reconcile. |
85 |
self.assertEqualDiff(expected, out) |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
86 |
self.assertEqualDiff(err, "") |