fix tests

Author: picnixz

Lib/test/test_ctypes/test_dlerror.py

@@ -1,4 +1,3 @@
-import _ctypes
 import os
 import platform
 import re
@@ -123,16 +122,27 @@ def test_null_dlsym(self):
             self.assertEqual(os.read(pipe_r, 2), b'OK')
 
 
-class TestCAPI(unittest.TestCase):
-
-    @unittest.skipUnless(hasattr(_ctypes, 'dlopen'), 'require ctypes.dlopen()')
-    @test.support.run_with_locales('LC_ALL', 'fr_FR.utf8', 'fr_FR.iso88591')
+@unittest.skipUnless(sys.platform.startswith('linux'),
+                     'test requires _ctypes.dlopen()')
+class TestLinuxLocalization(unittest.TestCase):
+
+    @test.support.run_with_locale(
+        'LC_ALL',
+        'fr_FR.iso88591', 'ja_JP.sjis', 'zh_CN.gbk',
+        '',
+    )
     def test_localized_error(self):
-        with self.assertRaisesRegex(
-            OSError,
-            re.escape("foo.so: Ne peut ouvrir le fichier d'objet partagé"),
-        ):
-            _ctypes.dlopen('foo.so', 2)
+        # An ImportError would be propagated and would be unexpected on Linux.
+        from _ctypes import dlopen
+
+        missing_filename = b'missing\xff.so'
+        # Depending whether the locale is ISO-88591 or not, we may either
+        # encode '\xff' as '\udcff' or 'ÿ', but we are only interested in
+        # avoiding a UnicodeDecodeError when reporting the dlerror() error
+        # message which contains the localized filename.
+        filename_pattern = r'missing[ÿ|\udcff].so:.+'
+        with self.assertRaisesRegex(OSError, filename_pattern):
+            dlopen(missing_filename, 2)
 
 
 if __name__ == "__main__":

Lib/test/test_dbm_gnu.py

@@ -1,11 +1,10 @@
 from test import support
 from test.support import import_helper, cpython_only
 gdbm = import_helper.import_module("dbm.gnu") #skip if not supported
-import re
 import unittest
 import os
-from test.support.os_helper import (TESTFN, TESTFN_NONASCII,
-                                    create_empty_file, unlink, FakePath)
+from test.support.os_helper import (TESTFN, TESTFN_NONASCII, FakePath,
+                                    create_empty_file, temp_dir, unlink)
 
 
 filename = TESTFN
@@ -207,11 +206,16 @@ def test_clear(self):
                 self.assertNotIn(k, db)
             self.assertEqual(len(db), 0)
 
-    @support.run_with_locales('LC_ALL', 'fr_FR.UTF-8', 'fr_FR.iso88591')
+    @support.run_with_locale(
+        'LC_ALL',
+        'fr_FR.iso88591', 'ja_JP.sjis', 'zh_CN.gbk',
+        '',
+    )
     def test_localized_error(self):
-        expect = re.escape('Base de données vide')
-        empty = create_empty_file(filename)
-        self.assertRaisesRegex(gdbm.error, expect, gdbm.open, filename, 'r')
+        with temp_dir() as d:
+            filename = os.path.join(os.fsencode(d), b'\xff')
+            create_empty_file(filename)
+            self.assertRaises(gdbm.error, gdbm.open, filename, 'r')
 
 
 if __name__ == '__main__':