← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
19
19
 
20
20
from cStringIO import StringIO
21
21
 
22
 
from bzrlib.selftest import TestCase, TestCaseInTempDir
 
22
from bzrlib.tests import TestCase, TestCaseInTempDir
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.revision import is_ancestor
25
25
 
28
28
 
29
29
    def test_straightline_ancestry(self):
30
30
        """Test ancestry file when just committing."""
31
 
        b = Branch.initialize('.')
 
31
        b = Branch.initialize(u'.')
32
32
        wt = b.working_tree()
33
33
 
34
34
        wt.commit(message='one',
45
45
                         b.get_ancestry('tester@foo--1'))
46
46
 
47
47
    def test_none_is_always_an_ancestor(self):
48
 
        b = Branch.initialize('.')
 
48
        b = Branch.initialize(u'.')
49
49
        # note this is tested before any commits are done.
50
50
        self.assertEqual(True, is_ancestor(None, None, b))
51
51
        wt = b.working_tree()