← 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: 2011-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

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
 
    )
25
22
 
26
23
 
27
24
class TestTreeShape(tests.TestCaseWithTransport):
38
35
        self.assertFileEqual('hello', '.bzr/README')
39
36
 
40
37
    def test_build_tree_symlink(self):
41
 
        self.requireFeature(features.SymlinkFeature)
 
38
        self.requireFeature(tests.SymlinkFeature)
42
39
        self.build_tree_contents([('link@', 'target')])
43
40
        self.assertEqual('target',
44
41
            os.readlink('link'))