test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(测试计划): 修复测试计划执行失败停止不生效问题 

--bug=1009623 --user=赵勇 【接口测试】测试计划执行勾选“失败停止”还是会执行完测试计划内用例 https://www.tapd.cn/55049933/s/1092484
This commit is contained in:
fit2-zhao 2022-01-14 18:58:19 +08:00 committed by fit2-zhao
parent cacef79a5c
commit 7c29321ead
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiExecutionQueueMapper.xml
View File

@ -5,7 +5,7 @@
DELETE from api_execution_queue where id not IN (SELECT t1.queue_id from api_execution_queue_detail t1); DELETE from api_execution_queue where id not IN (SELECT t1.queue_id from api_execution_queue_detail t1);
</delete> </delete>
<select id="findTestPlanReportQueue" resultType="io.metersphere.base.domain.ApiExecutionQueue"> <select id="findTestPlanReportQueue" resultType="io.metersphere.base.domain.ApiExecutionQueue">
select * from api_execution_queue where report_id !=null and run_mode='API_PLAN' and id not IN (SELECT t1.queue_id from api_execution_queue_detail t1) ; select * from api_execution_queue where report_id !=null and run_mode in('API_PLAN','JENKINS_SCENARIO_PLAN','SCHEDULE_SCENARIO_PLAN') and id not IN (SELECT t1.queue_id from api_execution_queue_detail t1) ;
</select> </select>
<select id="findTestPlanRunningReport" resultType="java.lang.String"> <select id="findTestPlanRunningReport" resultType="java.lang.String">

1
backend/src/main/java/io/metersphere/track/service/TestPlanService.java
View File

@ -1044,7 +1044,6 @@ public class TestPlanService {
RunModeConfigDTO runModeConfig = null; RunModeConfigDTO runModeConfig = null;
try { try {
runModeConfig = JSONObject.parseObject(apiRunConfig, RunModeConfigDTO.class); runModeConfig = JSONObject.parseObject(apiRunConfig, RunModeConfigDTO.class);
runModeConfig.setOnSampleError(false);
} catch (Exception e) { } catch (Exception e) {
LogUtil.error(e); LogUtil.error(e);
} }