Merge pull request RustPython#4104 from RustPython/fix-jsontests

youknowone · web-flow · commit d4a930176295 · 2022-08-19T13:09:14.000+09:00
Fix jsontests.py interaction with module-level SkipTest
diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml
@@ -29,8 +29,10 @@ jobs:
       - name: run snippets
         run: LLVM_PROFILE_FILE="$PWD/snippet-%p.profraw" pytest -v
         working-directory: ./extra_tests
+        continue-on-error: true
       - name: run cpython tests
         run: LLVM_PROFILE_FILE="$PWD/regrtest.profraw" target/release/rustpython -m test -v
+        continue-on-error: true
       - name: prepare code coverage data
         run: |
           rusttool() {
diff --git a/benches/execution.rs b/benches/execution.rs
@@ -116,7 +116,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
         .map(|entry| {
             let path = entry.unwrap().path();
             (
-                path.file_name().unwrap().to_owned().unwrap().to_owned(),
+                path.file_name().unwrap().to_str().unwrap().to_owned(),
                 std::fs::read_to_string(path).unwrap(),
             )
         })
diff --git a/benches/microbenchmarks.rs b/benches/microbenchmarks.rs
@@ -3,7 +3,7 @@ use criterion::{
     Criterion, Throughput,
 };
 use rustpython_compiler::Mode;
-use rustpython_vm::{common::ascii, AsObject, Interpreter, PyResult, Settings};
+use rustpython_vm::{AsObject, Interpreter, PyResult, Settings};
 use std::{
     ffi, fs, io,
     path::{Path, PathBuf},
@@ -138,7 +138,7 @@ fn bench_rustpy_code(group: &mut BenchmarkGroup<WallTime>, bench: &MicroBenchmar
                 scope
                     .locals
                     .as_object()
-                    .set_item(vm.new_pyobj(ascii!("ITERATIONS")), vm.new_pyobj(idx), vm)
+                    .set_item("ITERATIONS", vm.new_pyobj(idx), vm)
                     .expect("Error adding ITERATIONS local variable");
             }
             let setup_result = vm.run_code_obj(setup_code.clone(), scope.clone());
diff --git a/extra_tests/jsontests.py b/extra_tests/jsontests.py
@@ -3,9 +3,21 @@
 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):
diff --git a/whats_left.py b/whats_left.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3 -I
+#!/usr/bin/env -S python3 -I
 
 # This script generates Lib/snippets/whats_left_data.py with these variables defined:
 # expected_methods - a dictionary mapping builtin objects to their methods

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {`
`116`	`116`	`.map(\|entry\| {`
`117`	`117`	`let path = entry.unwrap().path();`
`118`	`118`	`(`
`119`		`- path.file_name().unwrap().to_owned().unwrap().to_owned(),`
	`119`	`+ path.file_name().unwrap().to_str().unwrap().to_owned(),`
`120`	`120`	`std::fs::read_to_string(path).unwrap(),`
`121`	`121`	`)`
`122`	`122`	`})`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python3 -I`
	`1`	`+#!/usr/bin/env -S python3 -I`
`2`	`2`
`3`	`3`	`# This script generates Lib/snippets/whats_left_data.py with these variables defined:`
`4`	`4`	`# expected_methods - a dictionary mapping builtin objects to their methods`