← 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: Canonical.com Patch Queue Manager
  • Date: 2007-03-28 06:58:22 UTC
  • mfrom: (2379.2.3 hpss-chroot)
  • Revision ID: pqm@pqm.ubuntu.com-20070328065822-999550a858a3ced3
(robertc) Fix chroot urls to not expose the url of the transport they are protecting, allowing regular url operations to work on them. (Robert Collins, Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
1
 
# Copyright (C) 2006, 2008-2011 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
 
from bzrlib.tests import per_repository
27
 
 
28
 
 
29
 
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):
 
23
from bzrlib.revision import Revision
 
24
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
 
25
from bzrlib.transport import get_transport
 
26
from bzrlib.workingtree import WorkingTree
 
27
 
 
28
 
 
29
class TestWorksWithSharedRepositories(TestCaseWithRepository):
30
30
 
31
31
    def test_reweave_empty(self):
32
32
        # we want a repo capable format
33
 
        parent = bzrdir.BzrDirMetaFormat1().initialize('.')
 
33
        parent = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('.')
34
34
        parent.create_repository(shared=True)
35
35
        parent.root_transport.mkdir('child')
36
 
        child = bzrdir.BzrDirMetaFormat1().initialize('child')
 
36
        child = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('child')
37
37
        self.assertRaises(errors.NoRepositoryPresent, child.open_repository)
38
38
        reconciler = Reconciler(child)
39
39
        reconciler.reconcile()
44
44
        self.assertEqual(0, reconciler.inconsistent_parents)
45
45
        # and no garbage inventories
46
46
        self.assertEqual(0, reconciler.garbage_inventories)
47
 
 
48
 
 
49
 
class TestReconciler(tests.TestCaseWithTransport):
50
 
 
51
 
    def test_reconciler_with_no_branch(self):
52
 
        repo = self.make_repository('repo')
53
 
        reconciler = Reconciler(repo.bzrdir)
54
 
        reconciler.reconcile()
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)
60
 
        self.assertIs(None, reconciler.fixed_branch_history)
61
 
 
62
 
    def test_reconciler_finds_branch(self):
63
 
        a_branch = self.make_branch('a_branch')
64
 
        reconciler = Reconciler(a_branch.bzrdir)
65
 
        reconciler.reconcile()
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)