/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
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
30
29
 
31
30
    def test_reweave_empty(self):
32
31
        # we want a repo capable format
33
 
        parent = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('.')
 
32
        parent = bzrdir.BzrDirMetaFormat1().initialize('.')
34
33
        parent.create_repository(shared=True)
35
34
        parent.root_transport.mkdir('child')
36
 
        child = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('child')
 
35
        child = bzrdir.BzrDirMetaFormat1().initialize('child')
37
36
        self.assertRaises(errors.NoRepositoryPresent, child.open_repository)
38
37
        reconciler = Reconciler(child)
39
38
        reconciler.reconcile()
44
43
        self.assertEqual(0, reconciler.inconsistent_parents)
45
44
        # and no garbage inventories
46
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)