← 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: Canonical.com Patch Queue Manager
  • Date: 2006-10-04 05:08:07 UTC
  • mfrom: (1986.4.8 test_ancestry.py)
  • Revision ID: pqm@pqm.ubuntu.com-20061004050807-10e3417a77ab9943
(Robert Collins, John Meinel) Change test_ancestry to use assertTrue and assertFalse over assertEqual(True,...

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
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
24
from bzrlib.revision import is_ancestor
25
25
 
26
26
 
27
 
class TestAncestry(TestCaseWithTransport):
 
27
class TestAncestry(TestCaseWithMemoryTransport):
 
28
 
 
29
    def assertAncestryEqual(self, expected, revision_id, branch):
 
30
        """Assert that the ancestry of revision_id in branch is as expected."""
 
31
        ancestry = branch.repository.get_ancestry(revision_id)
 
32
        self.assertEqual(expected, ancestry)
28
33
 
29
34
    def test_straightline_ancestry(self):
30
35
        """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'))
 
36
        tree = self.make_branch_and_memory_tree('.')
 
37
        branch = tree.branch
 
38
        rev_id_one = tree.commit('one')
 
39
        rev_id_two = tree.commit('two', allow_pointless=True)
 
40
 
 
41
        self.assertAncestryEqual([None, rev_id_one, rev_id_two],
 
42
            rev_id_two, branch)
 
43
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
46
44
 
47
45
    def test_none_is_always_an_ancestor(self):
48
 
        wt = self.make_branch_and_tree('.')
49
 
        b = wt.branch
 
46
        tree = self.make_branch_and_memory_tree('.')
50
47
        # 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))
 
48
        self.assertTrue(is_ancestor(None, None, tree.branch))
 
49
        rev_id = tree.commit('one')
 
50
        self.assertTrue(is_ancestor(None, None, tree.branch))
 
51
        self.assertTrue(is_ancestor(rev_id, None, tree.branch))
 
52
        self.assertFalse(is_ancestor(None, rev_id, tree.branch))
58
53
 
59
54
 
60
55
# TODO: check that ancestry is updated to include indirectly merged revisions