From 736496667329bf73a706aebec6f8287078df79ae Mon Sep 17 00:00:00 2001 From: Fabian Bieler Date: Fri, 19 Jan 2018 21:33:38 +0100 Subject: Revert "framework: Handle crashing subtest." This reverts commit 938ec48e2575b78defd06d169f704ed8d4f11bce. The behaviour introduced by this commit was not desired and breaks summaries for tests that crash before the first call to piglit_report_subtest_result. See also https://bugs.freedesktop.org/show_bug.cgi?id=104700 --- framework/results.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/framework/results.py b/framework/results.py index 786bd6b4d..99dd3735b 100644 --- a/framework/results.py +++ b/framework/results.py @@ -231,13 +231,7 @@ class TestResult(object): # Set special instances if 'subtests' in dict_: - subtests = dict_['subtests'] - if getattr(inst, 'result', status.NOTRUN) == status.CRASH: - # A test with subtests crashed. - # It's impossible to know what subtest (if any) - # crashed and how many subtests were not run. - subtests.update({'unknown': 'crash', '__type__': 'Subtests'}) - inst.subtests = Subtests.from_dict(subtests) + inst.subtests = Subtests.from_dict(dict_['subtests']) if 'time' in dict_: inst.time = TimeAttribute.from_dict(dict_['time']) -- cgit v1.2.3