← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mutabletree.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mutabletree.py
 
1
# Copyright (C) 2008 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
 
17
"""Tests for MutableTree.
 
18
 
 
19
Most functionality of MutableTree is tested as part of WorkingTree.
 
20
"""
 
21
 
 
22
from bzrlib import (
 
23
    mutabletree,
 
24
    tests,
 
25
    )
 
26
 
 
27
 
 
28
class TestHooks(tests.TestCase):
 
29
 
 
30
    def test_constructor(self):
 
31
        """Check that creating a MutableTreeHooks instance has the right
 
32
        defaults."""
 
33
        hooks = mutabletree.MutableTreeHooks()
 
34
        self.assertTrue("start_commit" in hooks,
 
35
                        "start_commit not in %s" % hooks)
 
36
        self.assertTrue("post_commit" in hooks,
 
37
                        "post_commit not in %s" % hooks)
 
38
 
 
39
    def test_installed_hooks_are_MutableTreeHooks(self):
 
40
        """The installed hooks object should be a MutableTreeHooks."""
 
41
        # 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
        self.tree.commit('first commit')
 
59
        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()
 
60
        other_tree.commit('mergeable commit')
 
61
        self.tree.merge_from_branch(other_tree.branch)
 
62
        self.assertTrue(self.tree.has_changes())