← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisiontree.py

  • Committer: Vincent Ladeuil
  • Date: 2008-01-29 15:16:31 UTC
  • mto: (3206.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3207.
  • Revision ID: v.ladeuil+lp@free.fr-20080129151631-vqjd13tb405mobx6
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.

* bzrlib/tests/test_transform.py:
(TestTransformMerge): Revert previous patch and cleanly call
preview.finalize now that we can.

* bzrlib/tests/test_merge.py:
(TestMerge.test_make_preview_transform): Catch TransformPreview
leak.

* bzrlib/builtins.py:
(cmd_merge._do_preview): Finalize the TransformPreview or the
limbodir will stay in /tmp.

* bzrlib/transform.py:
(TreeTransformBase.__init__): Create the _deletiondir since it's
reffered to by finalize.
(TreeTransformBase.finalize): Delete the dir only if _deletiondir
is set.
(TreeTransform.__init__): Use a temp var for deletiondir and set
the attribute after the base class __init__ has been called.
(TransformPreview.__init__): Read locks the tree since finalize
wants to unlock it (as suggested by Aaron).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisiontree.py
 
1
# Copyright (C) 2006 Canonical Ltd
 
2
# Authors:  Robert Collins <robert.collins@canonical.com>
 
3
#
 
4
# This program is free software; you can redistribute it and/or modify
 
5
# it under the terms of the GNU General Public License as published by
 
6
# the Free Software Foundation; either version 2 of the License, or
 
7
# (at your option) any later version.
 
8
#
 
9
# This program is distributed in the hope that it will be useful,
 
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
12
# GNU General Public License for more details.
 
13
#
 
14
# You should have received a copy of the GNU General Public License
 
15
# along with this program; if not, write to the Free Software
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
 
 
18
"""Tests for the RevisionTree class."""
 
19
 
 
20
from bzrlib import (
 
21
    revision,
 
22
    )
 
23
import bzrlib
 
24
from bzrlib.tests import TestCaseWithTransport
 
25
from bzrlib.tree import RevisionTree
 
26
 
 
27
 
 
28
class TestTreeWithCommits(TestCaseWithTransport):
 
29
 
 
30
    def setUp(self):
 
31
        super(TestTreeWithCommits, self).setUp()
 
32
        self.t = self.make_branch_and_tree('.')
 
33
        self.rev_id = self.t.commit('foo', allow_pointless=True)
 
34
        self.rev_tree = self.t.branch.repository.revision_tree(self.rev_id)
 
35
 
 
36
    def test_empty_no_unknowns(self):
 
37
        self.assertEqual([], list(self.rev_tree.unknowns()))
 
38
 
 
39
    def test_no_conflicts(self):
 
40
        self.assertEqual([], list(self.rev_tree.conflicts()))
 
41
 
 
42
    def test_parents(self):
 
43
        """RevisionTree.parent_ids should match the revision graph."""
 
44
        # XXX: TODO: Should this be a repository_implementation test ?
 
45
        # at the end of the graph, we get []
 
46
        self.assertEqual([], self.rev_tree.get_parent_ids())
 
47
        # do a commit to look further up
 
48
        revid_2 = self.t.commit('bar', allow_pointless=True)
 
49
        self.assertEqual(
 
50
            [self.rev_id],
 
51
            self.t.branch.repository.revision_tree(revid_2).get_parent_ids())
 
52
        # TODO commit a merge and check it is reported correctly.
 
53
 
 
54
        # the parents for a revision_tree(None) are []:
 
55
        self.assertEqual([],
 
56
            self.t.branch.repository.revision_tree(None).get_parent_ids())
 
57
 
 
58
    def test_empty_no_root(self):
 
59
        null_tree = self.t.branch.repository.revision_tree(
 
60
            revision.NULL_REVISION)
 
61
        self.assertIs(None, null_tree.inventory.root)