← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/test_test_trees.py
16
16
 
17
17
"""Tests for the test trees used by the per_tree tests."""
18
18
 
19
 
from bzrlib import tests
20
19
from bzrlib.tests import per_tree
 
20
from bzrlib.tests import (
 
21
    features,
 
22
    )
21
23
 
22
24
 
23
25
class TestTreeShapes(per_tree.TestCaseWithTree):
147
149
        # currently this test tree requires unicode. It might be good
148
150
        # to have it simply stop having the single unicode file in it
149
151
        # when dealing with a non-unicode filesystem.
150
 
        self.requireFeature(tests.SymlinkFeature)
 
152
        self.requireFeature(features.SymlinkFeature)
151
153
        tree = self.get_tree_with_subdirs_and_all_content_types()
152
154
        tree.lock_read()
153
155
        self.addCleanup(tree.unlock)