/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_mutabletree.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-12 18:05:15 UTC
  • mto: (4371.4.5 vila-better-heads)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090612180515-t0cwbjsnve094oik
Add a failing test for handling nodes that are in the same linear chain.

It fails because the ancestry skipping causes us to miss the fact that the two nodes
are actually directly related. We could check at the beginning, as the 
code used to do, but I think that will be incomplete for the more-than-two
heads cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mutabletree.py
19
19
Most functionality of MutableTree is tested as part of WorkingTree.
20
20
"""
21
21
 
22
 
from bzrlib import (
23
 
    mutabletree,
24
 
    tests,
25
 
    )
26
 
 
27
 
 
28
 
class TestHooks(tests.TestCase):
 
22
from bzrlib.tests import TestCase
 
23
from bzrlib.mutabletree import MutableTree, MutableTreeHooks
 
24
 
 
25
class TestHooks(TestCase):
29
26
 
30
27
    def test_constructor(self):
31
28
        """Check that creating a MutableTreeHooks instance has the right
32
29
        defaults."""
33
 
        hooks = mutabletree.MutableTreeHooks()
 
30
        hooks = MutableTreeHooks()
34
31
        self.assertTrue("start_commit" in hooks,
35
32
                        "start_commit not in %s" % hooks)
36
 
        self.assertTrue("post_commit" in hooks,
37
 
                        "post_commit not in %s" % hooks)
38
33
 
39
34
    def test_installed_hooks_are_MutableTreeHooks(self):
40
35
        """The installed hooks object should be a MutableTreeHooks."""
41
36
        # the installed hooks are saved in self._preserved_hooks.
42
 
        self.assertIsInstance(self._preserved_hooks[mutabletree.MutableTree][1],
43
 
                              mutabletree.MutableTreeHooks)
44
 
 
45
 
 
46
 
class TestHasChanges(tests.TestCaseWithTransport):
47
 
 
48
 
    def setUp(self):
49
 
        super(TestHasChanges, self).setUp()
50
 
        self.tree = self.make_branch_and_tree('tree')
51
 
 
52
 
    def test_with_uncommitted_changes(self):
53
 
        self.build_tree(['tree/file'])
54
 
        self.tree.add('file')
55
 
        self.assertTrue(self.tree.has_changes())
56
 
 
57
 
    def test_with_pending_merges(self):
58
 
        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()
59
 
        self.build_tree(['other/file'])
60
 
        other_tree.add('file')
61
 
        other_tree.commit('added file')
62
 
        self.tree.merge_from_branch(other_tree.branch)
63
 
        self.assertTrue(self.tree.has_changes())
 
37
        self.assertIsInstance(self._preserved_hooks[MutableTree][1],
 
38
                              MutableTreeHooks)
 
39
 
 
40