← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_testament.py

[merge] up-to-date against bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_testament.py
22
22
from sha import sha
23
23
import sys
24
24
 
25
 
from bzrlib.selftest import TestCaseInTempDir
26
 
from bzrlib.selftest.treeshape import build_tree_contents
 
25
from bzrlib.tests import TestCaseInTempDir
 
26
from bzrlib.tests.treeshape import build_tree_contents
27
27
from bzrlib.branch import Branch
28
28
from bzrlib.testament import Testament
29
29
from bzrlib.trace import mutter
44
44
        build_tree_contents([('hello', 'contents of hello file'),
45
45
                             ('src/', ),
46
46
                             ('src/foo.c', 'int main()\n{\n}\n')])
47
 
        b.add(['hello', 'src', 'src/foo.c'],
48
 
              ['hello-id', 'src-id', 'foo.c-id'])
 
47
        b.working_tree().add(['hello', 'src', 'src/foo.c'],
 
48
                             ['hello-id', 'src-id', 'foo.c-id'])
49
49
        b.working_tree().commit(message='add files and directories',
50
50
                 timestamp=1129025483,
51
51
                 timezone=36000,
96
96
        if not has_symlinks():
97
97
            return
98
98
        os.symlink('wibble/linktarget', 'link')
99
 
        self.b.add(['link'], ['link-id'])
 
99
        self.b.working_tree().add(['link'], ['link-id'])
100
100
        self.b.working_tree().commit(message='add symlink',
101
101
                 timestamp=1129025493,
102
102
                 timezone=36000,