← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_treeshape.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_treeshape.py
19
19
 
20
20
 
21
21
from bzrlib import tests
 
22
from bzrlib.tests import (
 
23
    features,
 
24
    )
22
25
 
23
26
 
24
27
class TestTreeShape(tests.TestCaseWithTransport):
30
33
            ('.bzr/',),
31
34
            ('.bzr/README', 'hello'),
32
35
            ])
33
 
        self.failUnlessExists('foo')
34
 
        self.failUnlessExists('.bzr/README')
 
36
        self.assertPathExists('foo')
 
37
        self.assertPathExists('.bzr/README')
35
38
        self.assertFileEqual('hello', '.bzr/README')
36
39
 
37
40
    def test_build_tree_symlink(self):
38
 
        self.requireFeature(tests.SymlinkFeature)
 
41
        self.requireFeature(features.SymlinkFeature)
39
42
        self.build_tree_contents([('link@', 'target')])
40
43
        self.assertEqual('target',
41
44
            os.readlink('link'))