~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_parents.py

  • Committer: Robert Collins
  • Date: 2006-09-05 09:49:40 UTC
  • mto: (1852.16.2 Tree.walkdirs)
  • mto: This revision was merged to the branch mainline in revision 1993.
  • Revision ID: robertc@robertcollins.net-20060905094940-d7ff941c7dfc56a9
DeprecatedĀ WorkingTree.pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
import os
20
20
 
21
 
from bzrlib import errors
 
21
from bzrlib import errors, symbol_versioning
22
22
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
23
23
from bzrlib.uncommit import uncommit
24
24
 
25
25
 
26
26
class TestParents(TestCaseWithWorkingTree):
27
27
 
 
28
    def generate_deprecation(self, a_callable, version_format):
 
29
        """Generate a deprecation warning string for a_callable."""
 
30
        name = ('%s.%s.%s' %
 
31
            (a_callable.im_class.__module__,
 
32
             a_callable.im_class.__name__,
 
33
             a_callable.__name__))
 
34
        return version_format % name
 
35
 
28
36
    def assertConsistentParents(self, expected, tree):
29
37
        """Check that the parents found are as expected.
30
38
 
33
41
        """
34
42
        self.assertEqual(expected, tree.get_parent_ids())
35
43
        last_rev_deprecations = [
36
 
            '%s.%s.%s was deprecated in version 0.11.' 
37
 
            % (tree.__class__.__module__,
38
 
               tree.__class__.__name__,
39
 
               tree.last_revision.__name__)]
 
44
            self.generate_deprecation(tree.last_revision, symbol_versioning.zero_eleven)]
 
45
        pending_merge_deprecations = [
 
46
            self.generate_deprecation(tree.pending_merges, symbol_versioning.zero_eleven)]
40
47
        if expected == []:
41
48
            self.assertEqual(None,
42
49
                self.callDeprecated(last_rev_deprecations, tree.last_revision))
44
51
            self.assertEqual(expected[0],
45
52
                self.callDeprecated(last_rev_deprecations, tree.last_revision))
46
53
        self.assertEqual(expected[1:],
47
 
            self.callDeprecated([], tree.pending_merges))
 
54
            self.callDeprecated(pending_merge_deprecations, tree.pending_merges))
48
55
 
49
56
 
50
57
class TestSetParents(TestParents):