← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_ancestry.py

Exclude more files from dumb-rsync upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_ancestry.py
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
16
16
 
 
17
import sys
 
18
import os
17
19
 
18
20
from cStringIO import StringIO
19
 
import os
20
 
import sys
21
21
 
22
 
from bzrlib.tests import TestCase, TestCaseWithTransport
 
22
from bzrlib.selftest import TestCase, TestCaseInTempDir
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(TestCaseInTempDir):
28
28
 
29
29
    def test_straightline_ancestry(self):
30
30
        """Test ancestry file when just committing."""
31
 
        wt = self.make_branch_and_tree('.')
32
 
        b = wt.branch
 
31
        b = Branch.initialize('.')
 
32
        wt = b.working_tree()
33
33
 
34
34
        wt.commit(message='one',
35
35
                  allow_pointless=True,
39
39
                  allow_pointless=True,
40
40
                  rev_id='tester@foo--2')
41
41
 
42
 
        ancs = b.repository.get_ancestry('tester@foo--2')
 
42
        ancs = b.get_ancestry('tester@foo--2')
43
43
        self.assertEqual([None, 'tester@foo--1', 'tester@foo--2'], ancs)
44
44
        self.assertEqual([None, 'tester@foo--1'], 
45
 
                         b.repository.get_ancestry('tester@foo--1'))
 
45
                         b.get_ancestry('tester@foo--1'))
46
46
 
47
47
    def test_none_is_always_an_ancestor(self):
48
 
        wt = self.make_branch_and_tree('.')
49
 
        b = wt.branch
 
48
        b = Branch.initialize('.')
50
49
        # note this is tested before any commits are done.
51
50
        self.assertEqual(True, is_ancestor(None, None, b))
 
51
        wt = b.working_tree()
52
52
        wt.commit(message='one',
53
53
                  allow_pointless=True,
54
54
                  rev_id='tester@foo--1')