From 69aac594c9978eb890f64d0b5ce7f3480ab418ce Mon Sep 17 00:00:00 2001 From: Noa Date: Wed, 24 Aug 2022 17:49:22 -0500 Subject: [PATCH] Try fixing jsontest? --- extra_tests/custom_text_test_runner.py | 21 +++++++++++---------- extra_tests/jsontests.py | 9 +++++++-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/extra_tests/custom_text_test_runner.py b/extra_tests/custom_text_test_runner.py index 57d9c335ae..cc3a8bbfff 100644 --- a/extra_tests/custom_text_test_runner.py +++ b/extra_tests/custom_text_test_runner.py @@ -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 diff --git a/extra_tests/jsontests.py b/extra_tests/jsontests.py index 93cb4b7dbd..7bc743d8d3 100644 --- a/extra_tests/jsontests.py +++ b/extra_tests/jsontests.py @@ -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)