/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: Vincent Ladeuil
  • Date: 2009-06-30 15:54:23 UTC
  • mto: (4496.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4497.
  • Revision ID: v.ladeuil+lp@free.fr-20090630155423-afousrl3zrdx0he2
Fixed as per jam's review.

* tests/blackbox/test_push.py:
(load_tests): One more changes type.
(TestPushStrictMixin): Switch to using mixin, it's clearer.
Define some default values as attributes so that they can be
changed more easily.
(TestPushStrictMixin.assertPushFails,
TestPushStrictMixin.assertPushSucceeds): Use default values from
attributes.
(TestPushStrictWithChanges._out_of_sync_trees): Setup a new
context and change the default values.

* errors.py:
(OutOfDateTree, UncommittedChanges): Add a more parameter so more
details can be given.

* builtins.py:
(cmd_push.run): Add an additional check that the tree is still in
sync with its branch before pushing.

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.tests import TestCase
 
23
from bzrlib.mutabletree import MutableTree, MutableTreeHooks
 
24
 
 
25
class TestHooks(TestCase):
 
26
 
 
27
    def test_constructor(self):
 
28
        """Check that creating a MutableTreeHooks instance has the right
 
29
        defaults."""
 
30
        hooks = MutableTreeHooks()
 
31
        self.assertTrue("start_commit" in hooks,
 
32
                        "start_commit not in %s" % hooks)
 
33
 
 
34
    def test_installed_hooks_are_MutableTreeHooks(self):
 
35
        """The installed hooks object should be a MutableTreeHooks."""
 
36
        # the installed hooks are saved in self._preserved_hooks.
 
37
        self.assertIsInstance(self._preserved_hooks[MutableTree][1],
 
38
                              MutableTreeHooks)
 
39
 
 
40