Skip to content

Commit 666e455

Browse files
andrykonchinandrykonchin
committed
[GR-67568] Fix unittest.TestCase.subTest and report failed subtests
PullRequest: graalpython/4028
2 parents 8d0faaa + 0a3bc04 commit 666e455

File tree

7 files changed

+11
-18
lines changed

7 files changed

+11
-18
lines changed

‎graalpython/com.oracle.graal.python.test/src/runner.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,17 @@ def addFailure(self, test, err):
262262
super().addFailure(test, err)
263263
self.report_result(self.make_result(test, status=TestStatus.FAILURE, param=format_exception(err[1])))
264264

265+
def addSubTest(self, test, subtest, err):
266+
super().addSubTest(test, subtest, err)
267+
268+
if err:
269+
if issubclass(err[0], test.failureException):
270+
status = TestStatus.FAILURE
271+
else:
272+
status = TestStatus.ERROR
273+
274+
self.report_result(self.make_result(test, status=status, param=format_exception(err[1])))
275+
265276
def addError(self, test, err):
266277
super().addError(test, err)
267278
self.report_result(self.make_result(test, status=TestStatus.ERROR, param=format_exception(err[1])))

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_capi.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ test.test_capi.test_misc.Test_testcapi.test_empty_argparse @ darwin-arm64,darwin
230230
test.test_capi.test_misc.Test_testcapi.test_from_contiguous @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
231231
test.test_capi.test_misc.Test_testcapi.test_from_spec_metatype_inheritance @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
232232
test.test_capi.test_misc.Test_testcapi.test_gc_control @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
233-
test.test_capi.test_misc.Test_testcapi.test_gc_visit_objects_basic @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
234233
test.test_capi.test_misc.Test_testcapi.test_gc_visit_objects_exit_early @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
235234
test.test_capi.test_misc.Test_testcapi.test_get_statictype_slots @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
236235
test.test_capi.test_misc.Test_testcapi.test_get_type_dict @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_importlib.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,11 @@ test.test_importlib.extension.test_loader.Source_SinglePhaseExtensionModuleTests
7575
test.test_importlib.extension.test_path_hook.Frozen_PathHookTests.test_success @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
7676
test.test_importlib.extension.test_path_hook.Source_PathHookTests.test_success @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
7777
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_failure @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
78-
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_module @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
7978
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_not_using_frozen @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
80-
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_package @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8179
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_path_ignored @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8280
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_target_ignored @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8381
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_failure @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
84-
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_module @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8582
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_not_using_frozen @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
86-
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_package @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8783
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_path_ignored @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8884
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_target_ignored @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8985
test.test_importlib.frozen.test_loader.Frozen_ExecModuleTests.test_lacking_parent @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags_bytecode_dsl/test_call.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
test.test_call.FastCallTests.test_fastcall @ linux-x86_64
21
test.test_call.FastCallTests.test_fastcall_clearing_dict @ linux-x86_64
3-
test.test_call.FastCallTests.test_vectorcall @ linux-x86_64
4-
test.test_call.FastCallTests.test_vectorcall_dict @ linux-x86_64
52
test.test_call.FunctionCalls.test_frames_are_popped_after_failed_calls @ linux-x86_64
63
test.test_call.FunctionCalls.test_kwargs_order @ linux-x86_64
74
test.test_call.TestCallingConventions.test_fastcall @ linux-x86_64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags_bytecode_dsl/test_fstring.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ test.test_fstring.TestCase.test_call @ linux-x86_64
1818
test.test_fstring.TestCase.test_closure @ linux-x86_64
1919
test.test_fstring.TestCase.test_comments @ linux-x86_64
2020
test.test_fstring.TestCase.test_compile_time_concat @ linux-x86_64
21-
test.test_fstring.TestCase.test_compile_time_concat_errors @ linux-x86_64
2221
test.test_fstring.TestCase.test_conversions @ linux-x86_64
2322
test.test_fstring.TestCase.test_custom_format_specifier @ linux-x86_64
2423
test.test_fstring.TestCase.test_debug_conversion @ linux-x86_64
2524
test.test_fstring.TestCase.test_debug_in_file @ linux-x86_64
26-
test.test_fstring.TestCase.test_del @ linux-x86_64
2725
test.test_fstring.TestCase.test_dict @ linux-x86_64
2826
test.test_fstring.TestCase.test_docstring @ linux-x86_64
2927
test.test_fstring.TestCase.test_double_braces @ linux-x86_64
@@ -53,7 +51,6 @@ test.test_fstring.TestCase.test_many_expressions @ linux-x86_64
5351
test.test_fstring.TestCase.test_misformed_unicode_character_name @ linux-x86_64
5452
test.test_fstring.TestCase.test_mismatched_braces @ linux-x86_64
5553
test.test_fstring.TestCase.test_mismatched_parens @ linux-x86_64
56-
test.test_fstring.TestCase.test_missing_expression @ linux-x86_64
5754
test.test_fstring.TestCase.test_missing_format_spec @ linux-x86_64
5855
test.test_fstring.TestCase.test_missing_variable @ linux-x86_64
5956
test.test_fstring.TestCase.test_multiple_vars @ linux-x86_64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags_bytecode_dsl/test_importlib.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ test.test_importlib.extension.test_loader.Frozen_LoaderTests.test_load_module_AP
3333
test.test_importlib.extension.test_loader.Frozen_LoaderTests.test_module @ linux-x86_64
3434
test.test_importlib.extension.test_loader.Frozen_LoaderTests.test_module_reuse @ linux-x86_64
3535
test.test_importlib.extension.test_loader.Frozen_LoaderTests.test_unloadable @ linux-x86_64
36-
test.test_importlib.extension.test_loader.Frozen_MultiPhaseExtensionModuleTests.test_bad_modules @ linux-x86_64
3736
test.test_importlib.extension.test_loader.Frozen_MultiPhaseExtensionModuleTests.test_functionality @ linux-x86_64
3837
test.test_importlib.extension.test_loader.Frozen_MultiPhaseExtensionModuleTests.test_load_short_name @ linux-x86_64
3938
test.test_importlib.extension.test_loader.Frozen_MultiPhaseExtensionModuleTests.test_load_submodule @ linux-x86_64
@@ -54,7 +53,6 @@ test.test_importlib.extension.test_loader.Source_LoaderTests.test_load_module_AP
5453
test.test_importlib.extension.test_loader.Source_LoaderTests.test_module @ linux-x86_64
5554
test.test_importlib.extension.test_loader.Source_LoaderTests.test_module_reuse @ linux-x86_64
5655
test.test_importlib.extension.test_loader.Source_LoaderTests.test_unloadable @ linux-x86_64
57-
test.test_importlib.extension.test_loader.Source_MultiPhaseExtensionModuleTests.test_bad_modules @ linux-x86_64
5856
test.test_importlib.extension.test_loader.Source_MultiPhaseExtensionModuleTests.test_functionality @ linux-x86_64
5957
test.test_importlib.extension.test_loader.Source_MultiPhaseExtensionModuleTests.test_load_short_name @ linux-x86_64
6058
test.test_importlib.extension.test_loader.Source_MultiPhaseExtensionModuleTests.test_load_submodule @ linux-x86_64
@@ -71,19 +69,15 @@ test.test_importlib.extension.test_loader.Source_MultiPhaseExtensionModuleTests.
7169
test.test_importlib.extension.test_path_hook.Frozen_PathHookTests.test_success @ linux-x86_64
7270
test.test_importlib.extension.test_path_hook.Source_PathHookTests.test_success @ linux-x86_64
7371
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_failure @ linux-x86_64
74-
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_module @ linux-x86_64
7572
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_not_using_frozen @ linux-x86_64
76-
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_package @ linux-x86_64
7773
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_path_ignored @ linux-x86_64
7874
test.test_importlib.frozen.test_finder.Frozen_FindSpecTests.test_target_ignored @ linux-x86_64
7975
test.test_importlib.frozen.test_finder.Frozen_FinderTests.test_failure @ linux-x86_64
8076
test.test_importlib.frozen.test_finder.Frozen_FinderTests.test_module @ linux-x86_64
8177
test.test_importlib.frozen.test_finder.Frozen_FinderTests.test_module_in_package @ linux-x86_64
8278
test.test_importlib.frozen.test_finder.Frozen_FinderTests.test_package @ linux-x86_64
8379
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_failure @ linux-x86_64
84-
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_module @ linux-x86_64
8580
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_not_using_frozen @ linux-x86_64
86-
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_package @ linux-x86_64
8781
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_path_ignored @ linux-x86_64
8882
test.test_importlib.frozen.test_finder.Source_FindSpecTests.test_target_ignored @ linux-x86_64
8983
test.test_importlib.frozen.test_finder.Source_FinderTests.test_failure @ linux-x86_64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags_bytecode_dsl/test_type_params.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ test.test_type_params.TypeParamsNonlocalTest.test_nonlocal_allowed @ linux-x86_6
6565
test.test_type_params.TypeParamsNonlocalTest.test_nonlocal_disallowed_01 @ linux-x86_64
6666
test.test_type_params.TypeParamsNonlocalTest.test_nonlocal_disallowed_02 @ linux-x86_64
6767
test.test_type_params.TypeParamsNonlocalTest.test_nonlocal_disallowed_03 @ linux-x86_64
68-
test.test_type_params.TypeParamsPickleTest.test_pickling_classes @ linux-x86_64
6968
test.test_type_params.TypeParamsPickleTest.test_pickling_functions @ linux-x86_64
7069
test.test_type_params.TypeParamsRuntimeTest.test_broken_class_namespace @ linux-x86_64
7170
test.test_type_params.TypeParamsRuntimeTest.test_name_error @ linux-x86_64

0 commit comments

Comments
 (0)