← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.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_ancestry.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2005, 2007 Canonical Ltd
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19
19
import os
20
20
import sys
21
21
 
22
 
from bzrlib.tests import TestCase, TestCaseWithTransport
 
22
from bzrlib.tests import TestCaseWithMemoryTransport
23
23
from bzrlib.branch import Branch
 
24
from bzrlib.branchbuilder import BranchBuilder
24
25
from bzrlib.revision import is_ancestor
25
 
 
26
 
 
27
 
class TestAncestry(TestCaseWithTransport):
 
26
from bzrlib.symbol_versioning import one_zero
 
27
 
 
28
 
 
29
class TestAncestry(TestCaseWithMemoryTransport):
 
30
 
 
31
    def assertAncestryEqual(self, expected, revision_id, branch):
 
32
        """Assert that the ancestry of revision_id in branch is as expected."""
 
33
        ancestry = branch.repository.get_ancestry(revision_id)
 
34
        self.assertEqual(expected, ancestry)
28
35
 
29
36
    def test_straightline_ancestry(self):
30
37
        """Test ancestry file when just committing."""
31
 
        wt = self.make_branch_and_tree('.')
32
 
        b = wt.branch
33
 
 
34
 
        wt.commit(message='one',
35
 
                  allow_pointless=True,
36
 
                  rev_id='tester@foo--1')
37
 
 
38
 
        wt.commit(message='two',
39
 
                  allow_pointless=True,
40
 
                  rev_id='tester@foo--2')
41
 
 
42
 
        ancs = b.repository.get_ancestry('tester@foo--2')
43
 
        self.assertEqual([None, 'tester@foo--1', 'tester@foo--2'], ancs)
44
 
        self.assertEqual([None, 'tester@foo--1'], 
45
 
                         b.repository.get_ancestry('tester@foo--1'))
46
 
 
47
 
    def test_none_is_always_an_ancestor(self):
48
 
        wt = self.make_branch_and_tree('.')
49
 
        b = wt.branch
50
 
        # note this is tested before any commits are done.
51
 
        self.assertEqual(True, is_ancestor(None, None, b))
52
 
        wt.commit(message='one',
53
 
                  allow_pointless=True,
54
 
                  rev_id='tester@foo--1')
55
 
        self.assertEqual(True, is_ancestor(None, None, b))
56
 
        self.assertEqual(True, is_ancestor('tester@foo--1', None, b))
57
 
        self.assertEqual(False, is_ancestor(None, 'tester@foo--1', b))
 
38
        builder = BranchBuilder(self.get_transport())
 
39
        rev_id_one = builder.build_commit()
 
40
        rev_id_two = builder.build_commit()
 
41
        branch = builder.get_branch()
 
42
        self.assertAncestryEqual([None, rev_id_one, rev_id_two],
 
43
            rev_id_two, branch)
 
44
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
 
45
 
 
46
    def test_none_is_ancestor_empty_branch(self):
 
47
        branch = self.make_branch('.')
 
48
        self.assertTrue(self.applyDeprecated(one_zero,
 
49
                        is_ancestor, 'null:', 'null:', branch))
 
50
 
 
51
    def test_none_is_ancestor_non_empty_branch(self):
 
52
        builder = BranchBuilder(self.get_transport())
 
53
        rev_id = builder.build_commit()
 
54
        branch = builder.get_branch()
 
55
        branch.lock_read()
 
56
        self.addCleanup(branch.unlock)
 
57
        self.assertTrue(self.applyDeprecated(one_zero,
 
58
                        is_ancestor, 'null:', 'null:', branch))
 
59
        self.assertTrue(self.applyDeprecated(one_zero,
 
60
                        is_ancestor, rev_id, 'null:',  branch))
 
61
        self.assertFalse(self.applyDeprecated(one_zero,
 
62
                         is_ancestor, 'null:', rev_id, branch))
58
63
 
59
64
 
60
65
# TODO: check that ancestry is updated to include indirectly merged revisions