← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevision.py

  • Committer: Robert Collins
  • Date: 2005-08-23 08:24:32 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050823082432-fe403dbe973a8b7a
start unifying _MyResult and _TextTestResult

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
20
20
def make_branches():
21
21
    from bzrlib.branch import Branch
22
22
    from bzrlib.commit import commit
23
 
    from bzrlib.revision import validate_revision_id
24
23
    import os
25
24
    os.mkdir("branch1")
26
25
    br1 = Branch("branch1", init=True)
27
 
    
28
 
    commit(br1, "Commit one", rev_id="a@u-0-0")
29
 
    commit(br1, "Commit two", rev_id="a@u-0-1")
30
 
    commit(br1, "Commit three", rev_id="a@u-0-2")
 
26
    commit(br1, "Commit one")
 
27
    commit(br1, "Commit two")
 
28
    commit(br1, "Commit three")
31
29
 
32
30
    os.mkdir("branch2")
33
31
    br2 = Branch("branch2", init=True)
34
32
    br2.update_revisions(br1)
35
 
    commit(br2, "Commit four", rev_id="b@u-0-3")
36
 
    commit(br2, "Commit five", rev_id="b@u-0-4")
 
33
    commit(br2, "Commit four")
 
34
    commit(br2, "Commit five")
37
35
    revisions_2 = br2.revision_history()
38
36
    br1.add_pending_merge(revisions_2[4])
39
 
    commit(br1, "Commit six", rev_id="a@u-0-3")
40
 
    commit(br1, "Commit seven", rev_id="a@u-0-4")
41
 
    commit(br2, "Commit eight", rev_id="b@u-0-5")
42
 
    br1.add_pending_merge(br2.revision_history()[5])
43
 
    commit(br1, "Commit nine", rev_id="a@u-0-5")
44
 
    br2.add_pending_merge(br1.revision_history()[4])
45
 
    commit(br2, "Commit ten", rev_id="b@u-0-6")
 
37
    commit(br1, "Commit six")
46
38
    return br1, br2
47
39
 
48
40
 
49
41
class TestIsAncestor(InTempDir):
50
 
 
51
 
    def test_is_ancestor(self):
52
 
        """Test checking whether a revision is an ancestor of another revision"""
 
42
    """Test checking whether a revision is an ancestor of another revision"""
 
43
    def runTest(self):
53
44
        from bzrlib.revision import is_ancestor, MultipleRevisionSources
54
45
        from bzrlib.errors import NoSuchRevision
55
46
        br1, br2 = make_branches()
69
60
        assert not is_ancestor(revisions[3], revisions_2[3], br1)
70
61
 
71
62
 
72
 
class TestCommonAncestor(InTempDir):
73
 
    """Test checking whether a revision is an ancestor of another revision"""
74
 
    def runTest(self):
75
 
        from bzrlib.revision import find_present_ancestors, common_ancestor
76
 
        from bzrlib.revision import MultipleRevisionSources
77
 
        br1, br2 = make_branches()
78
 
        revisions = br1.revision_history()
79
 
        revisions_2 = br2.revision_history()
80
 
        sources = MultipleRevisionSources(br1, br2)
81
 
 
82
 
        expected_ancestors_list = {revisions[3]:(0, 0), 
83
 
                                   revisions[2]:(1, 1),
84
 
                                   revisions_2[4]:(2, 1), 
85
 
                                   revisions[1]:(3, 2),
86
 
                                   revisions_2[3]:(4, 2),
87
 
                                   revisions[0]:(5, 3) }
88
 
        ancestors_list = find_present_ancestors(revisions[3], sources)
89
 
        assert len(expected_ancestors_list) == len(ancestors_list)
90
 
        for key, value in expected_ancestors_list.iteritems():
91
 
            self.assertEqual(ancestors_list[key], value, 
92
 
                              "key %r, %r != %r" % (key, ancestors_list[key],
93
 
                                                    value))
94
 
 
95
 
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
96
 
                          revisions[0])
97
 
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
98
 
                          revisions[1])
99
 
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
100
 
                          revisions[1])
101
 
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
102
 
                          revisions[2])
103
 
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
104
 
                          revisions_2[4])
105
 
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
106
 
                          revisions_2[4])
107
 
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
108
 
                          revisions[4])
109
 
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
110
 
                          revisions_2[5])
 
63
TEST_CLASSES = [
 
64
    TestIsAncestor,
 
65
    ]