mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Try fixing jsontest?

Browse Source
This commit is contained in:
Noa
2022-08-24 17:49:22 -05:00
parent 4ccdc19208
commit 69aac594c9
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
extra_tests/custom_text_test_runner.py
View File

@@ -247,10 +247,11 @@ class CustomTextTestResult(result.TestResult):
name_override = None
self.case = name_override if name_override else self.case
if self.show_test_info:
self.stream.writeln(self.separator2)
self.stream.writeln("CASE: %s" %self.case)
self.stream.writeln("Description: %s" %test.shortDescription())
self.stream.writeln(self.separator2)
# self.stream.writeln(self.separator2)
self.stream.write("CASE: %s" %self.case)
if desc := test.shortDescription(): self.stream.write(" (Description: %s)" % desc)
self.stream.write("... ")
# self.stream.writeln(self.separator2)
self.stream.flush()
self.current_case_number = self.case_number
if self.suite not in self.suite_map:
@@ -332,7 +333,7 @@ class CustomTextTestResult(result.TestResult):
def addSuccess(self, test):
super(CustomTextTestResult, self).addSuccess(test)
if self.show_test_info:
self.stream.writeln(self.separator_pre_result)
# self.stream.writeln(self.separator_pre_result)
self.stream.writeln("PASS")
self.stream.flush()
self.results['suites'][self.suite_map[self.suite]]['cases'][self.current_case_number]['result'] = 'passed'
@@ -343,7 +344,7 @@ class CustomTextTestResult(result.TestResult):
error_string = self.print_error_string(err)
super(CustomTextTestResult, self).addError(test, err)
if self.show_test_info:
self.stream.writeln(self.separator_pre_result)
# self.stream.writeln(self.separator_pre_result)
self.stream.writeln("ERROR")
self.stream.flush()
self.results['suites'][self.suite_map[self.suite]]['cases'][self.current_case_number]['result'] = 'error'
@@ -355,7 +356,7 @@ class CustomTextTestResult(result.TestResult):
error_string = self.print_error_string(err)
super(CustomTextTestResult, self).addFailure(test, err)
if self.show_test_info:
self.stream.writeln(self.separator_pre_result)
# self.stream.writeln(self.separator_pre_result)
self.stream.writeln("FAIL")
self.stream.flush()
self.results['suites'][self.suite_map[self.suite]]['cases'][self.current_case_number]['result'] = 'failed'
@@ -366,7 +367,7 @@ class CustomTextTestResult(result.TestResult):
def addSkip(self, test, reason):
super(CustomTextTestResult, self).addSkip(test, reason)
if self.show_test_info:
self.stream.writeln(self.separator_pre_result)
# self.stream.writeln(self.separator_pre_result)
self.stream.writeln("SKIPPED {0!r}".format(reason))
self.stream.flush()
self.results['suites'][self.suite_map[self.suite]]['cases'][self.current_case_number]['result'] = 'skipped'
@@ -376,7 +377,7 @@ class CustomTextTestResult(result.TestResult):
def addExpectedFailure(self, test, err):
super(CustomTextTestResult, self).addExpectedFailure(test, err)
if self.show_test_info:
self.stream.writeln(self.separator_pre_result)
# self.stream.writeln(self.separator_pre_result)
self.stream.writeln("EXPECTED FAILURE")
self.stream.flush()
self.results['suites'][self.suite_map[self.suite]]['cases'][self.current_case_number]['result'] = 'expected_failure'
@@ -386,7 +387,7 @@ class CustomTextTestResult(result.TestResult):
def addUnexpectedSuccess(self, test):
super(CustomTextTestResult, self).addUnexpectedSuccess(test)
if self.show_test_info:
self.stream.writeln(self.separator_pre_result)
# self.stream.writeln(self.separator_pre_result)
self.stream.writeln("UNEXPECTED SUCCESS")
self.stream.flush()
self.num_failed += 1

9
extra_tests/jsontests.py
View File

@@ -4,6 +4,11 @@ from test.libregrtest.runtest import findtests
import os
testnames = findtests()
# idk why this fixes the hanging, if it does
testnames.remove('test_importlib')
testnames.insert(0, 'test_importlib')
def loadTestsOrSkip(loader, name):
try:
return loader.loadTestsFromName(name)
@@ -17,13 +22,13 @@ def loadTestsOrSkip(loader, name):
return loader.suiteClass((TestClass(name),))
loader = unittest.defaultTestLoader
suite = loader.suiteClass([loadTestsOrSkip(loader, 'test.' + name) for name in findtests()])
suite = loader.suiteClass([loadTestsOrSkip(loader, 'test.' + name) for name in testnames])
resultsfile = os.path.join(os.path.dirname(__file__), "cpython_tests_results.json")
if os.path.exists(resultsfile):
os.remove(resultsfile)
runner = Runner(results_file_path=resultsfile)
runner = Runner(results_file_path=resultsfile, verbosity=2)
runner.run(suite)
print("Done! results are available in", resultsfile)