← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_filesystem_cicp.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/blackbox/test_filesystem_cicp.py
23
23
    osutils,
24
24
    tests,
25
25
    )
26
 
from bzrlib.tests import CaseInsCasePresFilenameFeature, KnownFailure
 
26
from bzrlib.tests import KnownFailure
27
27
from bzrlib.osutils import canonical_relpath, pathjoin
28
28
from bzrlib.tests.script import run_script
 
29
from bzrlib.tests.features import (
 
30
    CaseInsCasePresFilenameFeature,
 
31
    )
 
32
 
29
33
 
30
34
 
31
35
class TestCICPBase(tests.TestCaseWithTransport):