← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_tree/test_export.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/test_export.py
22
22
from bzrlib import osutils
23
23
from bzrlib import tests
24
24
from bzrlib.tests.per_tree import TestCaseWithTree
 
25
from bzrlib.tests import (
 
26
    features,
 
27
    )
25
28
 
26
29
 
27
30
class ExportTest(object):
37
40
        export(tree_a, 'output', self.exporter)
38
41
 
39
42
    def prepare_symlink_export(self):
40
 
        self.requireFeature(tests.SymlinkFeature)
 
43
        self.requireFeature(features.SymlinkFeature)
41
44
        work_a = self.make_branch_and_tree('wta')
42
45
        os.symlink('target', 'wta/link')
43
46
        work_a.add('link', 'link-id')