← 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: Martin Pool
  • Date: 2007-10-12 08:00:07 UTC
  • mto: This revision was merged to the branch mainline in revision 2913.
  • Revision ID: mbp@sourcefrog.net-20071012080007-vf80woayyom8s8e1
Rename update_to_one_parent_via_delta to more wieldy update_basis_by_delta

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
 
from bzrlib import bzrdir, errors, tests
 
20
import bzrlib
 
21
import bzrlib.errors as errors
21
22
from bzrlib.reconcile import reconcile, Reconciler
22
23
from bzrlib.revision import Revision
23
24
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
29
30
 
30
31
    def test_reweave_empty(self):
31
32
        # we want a repo capable format
32
 
        parent = bzrdir.BzrDirMetaFormat1().initialize('.')
 
33
        parent = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('.')
33
34
        parent.create_repository(shared=True)
34
35
        parent.root_transport.mkdir('child')
35
 
        child = bzrdir.BzrDirMetaFormat1().initialize('child')
 
36
        child = bzrlib.bzrdir.BzrDirMetaFormat1().initialize('child')
36
37
        self.assertRaises(errors.NoRepositoryPresent, child.open_repository)
37
38
        reconciler = Reconciler(child)
38
39
        reconciler.reconcile()
43
44
        self.assertEqual(0, reconciler.inconsistent_parents)
44
45
        # and no garbage inventories
45
46
        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)