~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_osutils.py

Update the osutils test to find the objects in the right locations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1128
1128
        self._filter_out_stat(result)
1129
1129
        self.assertEqual(expected_dirblocks, result)
1130
1130
 
1131
 
    def test__walkdirs_utf_win32_find_file(self):
 
1131
    def test__walkdirs_utf8_win32readdir(self):
1132
1132
        self.requireFeature(Win32ReadDirFeature)
1133
1133
        self.requireFeature(tests.UnicodeFilenameFeature)
1134
1134
        from bzrlib._walkdirs_win32 import Win32ReadDir
1135
1135
        self._save_platform_info()
1136
 
        osutils._selected_dir_reader = osutils.Win32ReadDir()
 
1136
        osutils._selected_dir_reader = Win32ReadDir()
1137
1137
        name0u = u'0file-\xb6'
1138
1138
        name1u = u'1dir-\u062c\u0648'
1139
1139
        name2u = u'2file-\u0633'
1170
1170
                 ]
1171
1171
                ),
1172
1172
            ]
1173
 
        result = list(_walkdirs_utf8(u'.'))
 
1173
        result = list(osutils._walkdirs_utf8(u'.'))
1174
1174
        self._filter_out_stat(result)
1175
1175
        self.assertEqual(expected_dirblocks, result)
1176
1176