From a596dc458d35d087d1aebc7b301985bdc4356ec1 Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Mon, 24 Oct 2016 12:11:44 +0200 Subject: [PATCH] rina: change how we report XFAIL so that the overall status is PASS if there's no FAIL/XPASS/ERROR --- software/build-rina/runTestSuite.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/software/build-rina/runTestSuite.in b/software/build-rina/runTestSuite.in index 83f0ab76d..c880e67a3 100644 --- a/software/build-rina/runTestSuite.in +++ b/software/build-rina/runTestSuite.in @@ -12,16 +12,16 @@ from erp5.util.testsuite import format_command dist_list = {{vm['dists'].split()}} publish = {{slapparameter_dict.get('publish')}} +# ERP5 must be changed to only distinguish SKIP/EXPECTED/UNEXPECTED, +# instead of SKIP/FAIL/ERROR. Unlike NEO, we categorize XFAIL as SKIP +# so that the overall status is PASS if there's no FAIL/XPASS/ERROR. STAT_MAP = dict( TOTAL = 'test_count', PASS = None, SKIP = 'skip_count', - # Same as for NEO. ERP5 must be changed to only distinguish - # - expected (-> 'failure' for now) and - # - unexpected (-> 'error') failures. - XFAIL = 'failure_count', - FAIL = 'error_count', - XPASS = 'error_count', + XFAIL = 'skip_count', + FAIL = 'failure_count', + XPASS = 'failure_count', ERROR = 'error_count', ) -- 2.30.9