diff options
Diffstat (limited to 'Lib/test/test_unicode_file.py')
| -rw-r--r-- | Lib/test/test_unicode_file.py | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/Lib/test/test_unicode_file.py b/Lib/test/test_unicode_file.py index 305f98b79a..f04bad3964 100644 --- a/Lib/test/test_unicode_file.py +++ b/Lib/test/test_unicode_file.py @@ -5,14 +5,14 @@ import os, glob, time, shutil import unicodedata import unittest -from test.test_support import run_unittest, TestSkipped, TESTFN_UNICODE -from test.test_support import TESTFN_ENCODING, TESTFN_UNICODE_UNENCODEABLE +from test.test_support import run_unittest, TESTFN_UNICODE +from test.test_support import TESTFN_ENCODING, TESTFN_UNENCODABLE try: TESTFN_ENCODED = TESTFN_UNICODE.encode(TESTFN_ENCODING) except (UnicodeError, TypeError): # Either the file system encoding is None, or the file name # cannot be encoded in the file system encoding. - raise TestSkipped("No Unicode filesystem semantics on this platform.") + raise unittest.SkipTest("No Unicode filesystem semantics on this platform.") if TESTFN_ENCODED.decode(TESTFN_ENCODING) != TESTFN_UNICODE: # The file system encoding does not support Latin-1 @@ -26,10 +26,10 @@ if TESTFN_ENCODED.decode(TESTFN_ENCODING) != TESTFN_UNICODE: # MBCS will not report the error properly raise UnicodeError, "mbcs encoding problem" except (UnicodeError, TypeError): - raise TestSkipped("Cannot find a suiteable filename.") + raise unittest.SkipTest("Cannot find a suiteable filename.") if TESTFN_ENCODED.decode(TESTFN_ENCODING) != TESTFN_UNICODE: - raise TestSkipped("Cannot find a suitable filename.") + raise unittest.SkipTest("Cannot find a suitable filename.") def remove_if_exists(filename): if os.path.exists(filename): @@ -42,19 +42,19 @@ class TestUnicodeFiles(unittest.TestCase): # Do all the tests we can given only a single filename. The file should # exist. def _do_single(self, filename): - self.failUnless(os.path.exists(filename)) - self.failUnless(os.path.isfile(filename)) - self.failUnless(os.access(filename, os.R_OK)) - self.failUnless(os.path.exists(os.path.abspath(filename))) - self.failUnless(os.path.isfile(os.path.abspath(filename))) - self.failUnless(os.access(os.path.abspath(filename), os.R_OK)) + self.assertTrue(os.path.exists(filename)) + self.assertTrue(os.path.isfile(filename)) + self.assertTrue(os.access(filename, os.R_OK)) + self.assertTrue(os.path.exists(os.path.abspath(filename))) + self.assertTrue(os.path.isfile(os.path.abspath(filename))) + self.assertTrue(os.access(os.path.abspath(filename), os.R_OK)) os.chmod(filename, 0777) os.utime(filename, None) os.utime(filename, (time.time(), time.time())) # Copy/rename etc tests using the same filename self._do_copyish(filename, filename) # Filename should appear in glob output - self.failUnless( + self.assertTrue( os.path.abspath(filename)==os.path.abspath(glob.glob(filename)[0])) # basename should appear in listdir. path, base = os.path.split(os.path.abspath(filename)) @@ -71,7 +71,7 @@ class TestUnicodeFiles(unittest.TestCase): base = unicodedata.normalize("NFD", base) file_list = [unicodedata.normalize("NFD", f) for f in file_list] - self.failUnless(base in file_list) + self.assertIn(base, file_list) # Do as many "equivalancy' tests as we can - ie, check that although we # have different types for the filename, they refer to the same file. @@ -79,12 +79,12 @@ class TestUnicodeFiles(unittest.TestCase): # Note we only check "filename1 against filename2" - we don't bother # checking "filename2 against 1", as we assume we are called again with # the args reversed. - self.failUnless(type(filename1)!=type(filename2), + self.assertTrue(type(filename1)!=type(filename2), "No point checking equivalent filenames of the same type") # stat and lstat should return the same results. - self.failUnlessEqual(os.stat(filename1), + self.assertEqual(os.stat(filename1), os.stat(filename2)) - self.failUnlessEqual(os.lstat(filename1), + self.assertEqual(os.lstat(filename1), os.lstat(filename2)) # Copy/rename etc tests using equivalent filename self._do_copyish(filename1, filename2) @@ -92,19 +92,19 @@ class TestUnicodeFiles(unittest.TestCase): # Tests that copy, move, etc one file to another. def _do_copyish(self, filename1, filename2): # Should be able to rename the file using either name. - self.failUnless(os.path.isfile(filename1)) # must exist. + self.assertTrue(os.path.isfile(filename1)) # must exist. os.rename(filename1, filename2 + ".new") - self.failUnless(os.path.isfile(filename1+".new")) + self.assertTrue(os.path.isfile(filename1+".new")) os.rename(filename1 + ".new", filename2) - self.failUnless(os.path.isfile(filename2)) + self.assertTrue(os.path.isfile(filename2)) shutil.copy(filename1, filename2 + ".new") os.unlink(filename1 + ".new") # remove using equiv name. # And a couple of moves, one using each name. shutil.move(filename1, filename2 + ".new") - self.failUnless(not os.path.exists(filename2)) + self.assertTrue(not os.path.exists(filename2)) shutil.move(filename1 + ".new", filename2) - self.failUnless(os.path.exists(filename1)) + self.assertTrue(os.path.exists(filename1)) # Note - due to the implementation of shutil.move, # it tries a rename first. This only fails on Windows when on # different file systems - and this test can't ensure that. @@ -131,7 +131,7 @@ class TestUnicodeFiles(unittest.TestCase): cwd_result = unicodedata.normalize("NFD", cwd_result) name_result = unicodedata.normalize("NFD", name_result) - self.failUnlessEqual(os.path.basename(cwd_result),name_result) + self.assertEqual(os.path.basename(cwd_result),name_result) finally: os.chdir(cwd) finally: @@ -147,7 +147,7 @@ class TestUnicodeFiles(unittest.TestCase): self._do_single(filename) finally: os.unlink(filename) - self.failUnless(not os.path.exists(filename)) + self.assertTrue(not os.path.exists(filename)) # and again with os.open. f = os.open(filename, os.O_CREAT) os.close(f) @@ -158,7 +158,7 @@ class TestUnicodeFiles(unittest.TestCase): def _test_equivalent(self, filename1, filename2): remove_if_exists(filename1) - self.failUnless(not os.path.exists(filename2)) + self.assertTrue(not os.path.exists(filename2)) f = file(filename1, "w") f.close() try: @@ -171,8 +171,8 @@ class TestUnicodeFiles(unittest.TestCase): def test_single_files(self): self._test_single(TESTFN_ENCODED) self._test_single(TESTFN_UNICODE) - if TESTFN_UNICODE_UNENCODEABLE is not None: - self._test_single(TESTFN_UNICODE_UNENCODEABLE) + if TESTFN_UNENCODABLE is not None: + self._test_single(TESTFN_UNENCODABLE) def test_equivalent_files(self): self._test_equivalent(TESTFN_ENCODED, TESTFN_UNICODE) @@ -188,9 +188,9 @@ class TestUnicodeFiles(unittest.TestCase): self._do_directory(TESTFN_UNICODE+ext, TESTFN_ENCODED+ext, False) self._do_directory(TESTFN_UNICODE+ext, TESTFN_UNICODE+ext, False) # Our directory name that can't use a non-unicode name. - if TESTFN_UNICODE_UNENCODEABLE is not None: - self._do_directory(TESTFN_UNICODE_UNENCODEABLE+ext, - TESTFN_UNICODE_UNENCODEABLE+ext, + if TESTFN_UNENCODABLE is not None: + self._do_directory(TESTFN_UNENCODABLE+ext, + TESTFN_UNENCODABLE+ext, False) def test_main(): |