Unverified Commit a8ab71fc authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #14970 from mvdbeek/alt_fix_expected_failure_occurred 

[22.01] Set test status to success on expected failure
parents d75c0fdb 9570da58

lib/galaxy/tool_util/verify/interactor.py

+5 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,11 @@ def verify_tool(tool_id, 
                job_data["execution_problem"] = util.unicodify(tool_execution_exception)

                dynamic_param_error = getattr(tool_execution_exception, "dynamic_param_error", False)

                job_data["dynamic_param_error"] = dynamic_param_error

                status = "error" if not skip_on_dynamic_param_errors or not dynamic_param_error else "skip"

                if not expected_failure_occurred:

                    if skip_on_dynamic_param_errors and dynamic_param_error:

                        status = "skip"

                    else:

                        status = "error"

            if input_staging_exception:

                job_data["execution_problem"] = f"Input staging problem: {util.unicodify(input_staging_exception)}"

                status = "error"