← 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: Aaron Bentley
  • Date: 2008-03-11 14:29:08 UTC
  • mto: This revision was merged to the branch mainline in revision 3264.
  • Revision ID: aaron@aaronbentley.com-20080311142908-yyrvcpn2mldt0fnn
Update documentation to reflect conflict-handling difference

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
1
 
# Copyright (C) 2006, 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
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
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
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for reconiliation behaviour that is repository independent."""
18
18
 
19
19
 
20
 
from bzrlib import (
21
 
    bzrdir,
22
 
    errors,
23
 
    tests,
24
 
    )
 
20
import bzrlib
 
21
import bzrlib.errors as errors
25
22
from bzrlib.reconcile import reconcile, Reconciler
26
23
from bzrlib.revision import Revision
27
 
from bzrlib.tests import per_repository
 
24
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
 
25
from bzrlib.transport import get_transport
28
26
from bzrlib.workingtree import WorkingTree
29
27
 
30
28
 
31
 
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):
 
29
class TestWorksWithSharedRepositories(TestCaseWithRepository):
32
30
 
33
31
    def test_reweave_empty(self):
34
32
        # we want a repo capable format
35
 
        parent = bzrdir.BzrDirMetaFormat1().initialize('.')
 
33
        parent = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('.')
36
34
        parent.create_repository(shared=True)
37
35
        parent.root_transport.mkdir('child')
38
 
        child = bzrdir.BzrDirMetaFormat1().initialize('child')
 
36
        child = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('child')
39
37
        self.assertRaises(errors.NoRepositoryPresent, child.open_repository)
40
38
        reconciler = Reconciler(child)
41
39
        reconciler.reconcile()
46
44
        self.assertEqual(0, reconciler.inconsistent_parents)
47
45
        # and no garbage inventories
48
46
        self.assertEqual(0, reconciler.garbage_inventories)
49
 
 
50
 
 
51
 
class TestReconciler(tests.TestCaseWithTransport):
52
 
 
53
 
    def test_reconciler_with_no_branch(self):
54
 
        repo = self.make_repository('repo')
55
 
        reconciler = Reconciler(repo.bzrdir)
56
 
        reconciler.reconcile()
57
 
        # no inconsistent parents should have been found
58
 
        # but the values should have been set.
59
 
        self.assertEqual(0, reconciler.inconsistent_parents)
60
 
        # and no garbage inventories
61
 
        self.assertEqual(0, reconciler.garbage_inventories)
62
 
        self.assertIs(None, reconciler.fixed_branch_history)
63
 
 
64
 
    def test_reconciler_finds_branch(self):
65
 
        a_branch = self.make_branch('a_branch')
66
 
        reconciler = Reconciler(a_branch.bzrdir)
67
 
        reconciler.reconcile()
68
 
 
69
 
        # It should have checked the repository, and the branch
70
 
        self.assertEqual(0, reconciler.inconsistent_parents)
71
 
        self.assertEqual(0, reconciler.garbage_inventories)
72
 
        self.assertIs(False, reconciler.fixed_branch_history)