← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/features.py

  • Committer: Martin Packman
  • Date: 2011-11-28 19:07:58 UTC
  • mfrom: (6318 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6319.
  • Revision ID: martin.packman@canonical.com-20111128190758-5gj44o5uzwz5sjfq
Merge bzr.dev to resolve conflicts with updated registry help strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/features.py
26
26
from bzrlib import (
27
27
    osutils,
28
28
    symbol_versioning,
29
 
    tests,
30
29
    )
31
30
 
32
31
 
290
289
        if CaseInsCasePresFilenameFeature.available():
291
290
            return False
292
291
 
 
292
        from bzrlib import tests
 
293
 
293
294
        if tests.TestCaseWithMemoryTransport.TEST_ROOT is None:
294
295
            root = osutils.mkdtemp(prefix='testbzr-', suffix='.tmp')
295
296
            tests.TestCaseWithMemoryTransport.TEST_ROOT = root
490
491
 
491
492
 
492
493
win32_feature = Win32Feature()
493
 
 
494
 
 
495
 
for name in ['HTTPServerFeature', 
496
 
    'HTTPSServerFeature', 'SymlinkFeature', 'HardlinkFeature',
497
 
    'OsFifoFeature', 'UnicodeFilenameFeature',
498
 
    'ByteStringNamedFilesystem', 'UTF8Filesystem',
499
 
    'BreakinFeature', 'CaseInsCasePresFilenameFeature',
500
 
    'CaseInsensitiveFilesystemFeature', 'case_sensitive_filesystem_feature',
501
 
    'posix_permissions_feature',
502
 
    ]:
503
 
    setattr(tests, name, _CompatabilityThunkFeature(
504
 
        symbol_versioning.deprecated_in((2, 5, 0)),
505
 
        'bzrlib.tests', name,
506
 
        name, 'bzrlib.tests.features'))
507
 
 
508
 
 
509
 
for (old_name, new_name) in [
510
 
    ('UnicodeFilename', 'UnicodeFilenameFeature'),
511
 
    ]:
512
 
    setattr(tests, name, _CompatabilityThunkFeature(
513
 
        symbol_versioning.deprecated_in((2, 5, 0)),
514
 
        'bzrlib.tests', old_name,
515
 
        new_name, 'bzrlib.tests.features'))