Fix jsontests.py interaction with module-level SkipTest

extra_tests/jsontests.py

@@ -3,9 +3,21 @@ from custom_text_test_runner import CustomTextTestRunner as Runner
 from test.libregrtest.runtest import findtests
 import os
 
-testnames = ('test.' + name for name in findtests())
 
-suite = unittest.defaultTestLoader.loadTestsFromNames(testnames)
+def loadTestsOrSkip(loader, name):
+    try:
+        return loader.loadTestsFromName(name)
+    except unittest.SkipTest as exc:
+        # from _make_skipped_test from unittest/loader.py
+        @unittest.skip(str(exc))
+        def testSkipped(self):
+            pass
+        attrs = {name: testSkipped}
+        TestClass = type("ModuleSkipped", (unittest.TestCase,), attrs)
+        return loader.suiteClass((TestClass(name),))
+
+loader = unittest.defaultTestLoader
+suite = loader.suiteClass([loadTestsOrSkip(loader, 'test.' + name) for name in findtests()])
 
 resultsfile = os.path.join(os.path.dirname(__file__), "cpython_tests_results.json")
 if os.path.exists(resultsfile):