← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

  • Committer: Andrew Bennetts
  • Date: 2008-09-05 10:48:03 UTC
  • mto: This revision was merged to the branch mainline in revision 3693.
  • Revision ID: andrew.bennetts@canonical.com-20080905104803-6g72dz6wcldosfs2
Remove monkey-patching of branch._ensure_real from test_remote.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
1
 
# Copyright (C) 2006 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2006 Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
"""Tests for reconiliation behaviour that is repository independent."""
18
18
 
19
19
 
20
 
import bzrlib
21
 
import bzrlib.errors as errors
 
20
from bzrlib import bzrdir, errors, tests
22
21
from bzrlib.reconcile import reconcile, Reconciler
23
22
from bzrlib.revision import Revision
24
23
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
25
24
from bzrlib.transport import get_transport
26
 
from bzrlib.tree import EmptyTree
27
25
from bzrlib.workingtree import WorkingTree
28
26
 
29
27
 
31
29
 
32
30
    def test_reweave_empty(self):
33
31
        # we want a repo capable format
34
 
        parent = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('.')
 
32
        parent = bzrdir.BzrDirMetaFormat1().initialize('.')
35
33
        parent.create_repository(shared=True)
36
34
        parent.root_transport.mkdir('child')
37
 
        child = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('child')
 
35
        child = bzrdir.BzrDirMetaFormat1().initialize('child')
38
36
        self.assertRaises(errors.NoRepositoryPresent, child.open_repository)
39
37
        reconciler = Reconciler(child)
40
38
        reconciler.reconcile()
45
43
        self.assertEqual(0, reconciler.inconsistent_parents)
46
44
        # and no garbage inventories
47
45
        self.assertEqual(0, reconciler.garbage_inventories)
 
46
 
 
47
 
 
48
class TestReconciler(tests.TestCaseWithTransport):
 
49
    
 
50
    def test_reconciler_with_no_branch(self):
 
51
        repo = self.make_repository('repo')
 
52
        reconciler = Reconciler(repo.bzrdir)
 
53
        reconciler.reconcile()
 
54
        # no inconsistent parents should have been found
 
55
        # but the values should have been set.
 
56
        self.assertEqual(0, reconciler.inconsistent_parents)
 
57
        # and no garbage inventories
 
58
        self.assertEqual(0, reconciler.garbage_inventories)
 
59
        self.assertIs(None, reconciler.fixed_branch_history)
 
60
 
 
61
    def test_reconciler_finds_branch(self):
 
62
        a_branch = self.make_branch('a_branch')
 
63
        reconciler = Reconciler(a_branch.bzrdir)
 
64
        reconciler.reconcile()
 
65
 
 
66
        # It should have checked the repository, and the branch
 
67
        self.assertEqual(0, reconciler.inconsistent_parents)
 
68
        self.assertEqual(0, reconciler.garbage_inventories)
 
69
        self.assertIs(False, reconciler.fixed_branch_history)