← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_osutils.py

A bunch of osutils tests depended on features being available.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils.py
989
989
 
990
990
    def test_osutils_binding(self):
991
991
        from bzrlib.tests import test__chunks_to_lines
992
 
        if test__chunks_to_lines.compiled_chunkstolines.available():
 
992
        if test__chunks_to_lines.compiled_chunkstolines_feature.available():
993
993
            from bzrlib._chunks_to_lines_pyx import chunks_to_lines
994
994
        else:
995
995
            from bzrlib._chunks_to_lines_py import chunks_to_lines
1181
1181
 
1182
1182
    def test_force_walkdirs_utf8_nt(self):
1183
1183
        # Disabled because the thunk of the whole walkdirs api is disabled.
1184
 
        self.requireFeature(test__walkdirs_win32.Win32ReadDirFeature)
 
1184
        self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
1185
1185
        self._save_platform_info()
1186
1186
        win32utils.winver = 'Windows NT'
1187
1187
        from bzrlib._walkdirs_win32 import Win32ReadDir
1188
1188
        self.assertDirReaderIs(Win32ReadDir)
1189
1189
 
1190
1190
    def test_force_walkdirs_utf8_98(self):
1191
 
        self.requireFeature(test__walkdirs_win32.Win32ReadDirFeature)
 
1191
        self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
1192
1192
        self._save_platform_info()
1193
1193
        win32utils.winver = 'Windows 98'
1194
1194
        self.assertDirReaderIs(osutils.UnicodeDirReader)
1345
1345
        self.assertEqual(expected_dirblocks, result)
1346
1346
 
1347
1347
    def test__walkdirs_utf8_win32readdir(self):
1348
 
        self.requireFeature(test__walkdirs_win32.Win32ReadDirFeature)
 
1348
        self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
1349
1349
        self.requireFeature(tests.UnicodeFilenameFeature)
1350
1350
        from bzrlib._walkdirs_win32 import Win32ReadDir
1351
1351
        self._save_platform_info()
1402
1402
 
1403
1403
    def test__walkdirs_utf_win32_find_file_stat_file(self):
1404
1404
        """make sure our Stat values are valid"""
1405
 
        self.requireFeature(test__walkdirs_win32.Win32ReadDirFeature)
 
1405
        self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
1406
1406
        self.requireFeature(tests.UnicodeFilenameFeature)
1407
1407
        from bzrlib._walkdirs_win32 import Win32ReadDir
1408
1408
        name0u = u'0file-\xb6'
1426
1426
 
1427
1427
    def test__walkdirs_utf_win32_find_file_stat_directory(self):
1428
1428
        """make sure our Stat values are valid"""
1429
 
        self.requireFeature(test__walkdirs_win32.Win32ReadDirFeature)
 
1429
        self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
1430
1430
        self.requireFeature(tests.UnicodeFilenameFeature)
1431
1431
        from bzrlib._walkdirs_win32 import Win32ReadDir
1432
1432
        name0u = u'0dir-\u062c\u0648'