All runtime tests passing on x86_64 on both Python 3.12 and 3.8 (closes

#967)

product/runtime/src/test/python/chaquopy/test/android/test_import.py

@@ -16,7 +16,7 @@
 from shutil import rmtree
 import sys
 from traceback import format_exc
-from unittest import expectedFailure, skipIf
+from unittest import skipIf
 import types
 from warnings import catch_warnings, filterwarnings
 
@@ -52,10 +52,6 @@ class TestAndroidImport(FilterWarningsCase):
 
     maxDiff = None
 
-    # This will be fixed in Python 3.12.1 (https://github.com/python/cpython/pull/110247)
-    expectedFailure312 = expectedFailure if sys.version_info >= (3, 12) else lambda x: x
-
-    @expectedFailure312
     def test_bootstrap(self):
         chaquopy_dir = join(str(context.getFilesDir()), "chaquopy")
         self.assertCountEqual(["AssetFinder", "bootstrap-native", "bootstrap.imy",
@@ -75,7 +71,7 @@ def test_bootstrap(self):
             stdlib_bootstrap_expected |= {"_sha2.so"}
 
         for subdir, entries in [
-            (ABI, stdlib_bootstrap_expected),
+            (ABI, list(stdlib_bootstrap_expected)),
             (f"{ABI}/java", ["chaquopy.so"]),
         ]:
             with self.subTest(subdir=subdir):

product/runtime/src/test/python/chaquopy/test/android/test_stdlib.py

@@ -22,7 +22,9 @@ def test_datetime(self):
         # imported.
         self.assertTrue(datetime.datetime_CAPI)
 
-    # This will be fixed in Python 3.12.1 (https://github.com/python/cpython/pull/110247)
+    # hashlib is currently being imported before the importer is ready, causing some
+    # algorithms to be unavailable. This will be fixed in Python 3.12.1
+    # (https://github.com/python/cpython/pull/110247)
     expectedFailure312 = expectedFailure if sys.version_info >= (3, 12) else lambda x: x
 
     @expectedFailure312
@@ -123,7 +125,9 @@ def test_os(self):
                 self.assertTrue(os.access(name, os.X_OK))
 
         for args in [[], [1]]:
-            with self.assertRaisesRegex(OSError, "Inappropriate ioctl for device"):
+            with self.assertRaisesRegex(
+                OSError, r"Inappropriate ioctl for device|Not a typewriter"
+            ):
                 os.get_terminal_size(*args)
 
     def test_pickle(self):