← 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: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

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
 
141
140
                                            % (self._module, self._name))
142
141
            use_msg = ' Use %s.%s instead.' % (self._replacement_module,
143
142
                                               self._replacement_name)
144
 
            symbol_versioning.warn(depr_msg + use_msg, DeprecationWarning)
 
143
            symbol_versioning.warn(depr_msg + use_msg, DeprecationWarning,
 
144
                                   stacklevel=5)
145
145
            # Import the new feature and use it as a replacement for the
146
146
            # deprecated one.
147
147
            self._feature = pyutils.get_named_object(
290
290
        if CaseInsCasePresFilenameFeature.available():
291
291
            return False
292
292
 
 
293
        from bzrlib import tests
 
294
 
293
295
        if tests.TestCaseWithMemoryTransport.TEST_ROOT is None:
294
296
            root = osutils.mkdtemp(prefix='testbzr-', suffix='.tmp')
295
297
            tests.TestCaseWithMemoryTransport.TEST_ROOT = root
407
409
 
408
410
 
409
411
bash_feature = ExecutableFeature('bash')
 
412
diff_feature = ExecutableFeature('diff')
410
413
sed_feature = ExecutableFeature('sed')
411
 
diff_feature = ExecutableFeature('diff')
 
414
msgmerge_feature = ExecutableFeature('msgmerge')
412
415
 
413
416
 
414
417
class _PosixPermissionsFeature(Feature):
421
424
            f = tempfile.mkstemp(prefix='bzr_perms_chk_')
422
425
            fd, name = f
423
426
            os.close(fd)
424
 
            os.chmod(name, write_perms)
 
427
            osutils.chmod_if_possible(name, write_perms)
425
428
 
426
429
            read_perms = os.stat(name).st_mode & 0777
427
430
            os.unlink(name)
490
493
 
491
494
 
492
495
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'))