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

Revert fix: Jenkins插件执行有失败用例的测试计划时Jenkins插件会一直死循环 #4809 #4810 

This reverts commit a08fba0f
This commit is contained in:
fit2-zhao 2021-07-20 10:30:42 +08:00 committed by fit2-zhao
parent e6045f9a2c
commit 5ecb9c9bf2
2 changed files with 2 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/api/dto/definition/request/MsThreadGroup.java
View File

@ -66,7 +66,7 @@ public class MsThreadGroup extends MsTestElement {
threadGroup.setDuration(0);
threadGroup.setProperty(ThreadGroup.ON_SAMPLE_ERROR, ThreadGroup.ON_SAMPLE_ERROR_CONTINUE);
threadGroup.setScheduler(false);
if (onSampleError != null && onSampleError) { // onSampleError 为true 表示失败停止
if (onSampleError != null && !onSampleError) {
threadGroup.setProperty("ThreadGroup.on_sample_error", "stoptest");
}
threadGroup.setSamplerController(loopController);

2
backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
View File

@ -157,7 +157,7 @@ public class TestPlanController {
ApiRunConfigDTO api = new ApiRunConfigDTO();
api.setMode(testplanRunRequest.getMode());
api.setResourcePoolId(testplanRunRequest.getResourcePoolId());
api.setOnSampleError(false); // OnSampleError 为false表示失败不停止，若设置为true会导致bug #4809
api.setOnSampleError(true);
api.setReportType("iddReport");
String apiRunConfig = JSONObject.toJSONString(api);
return testPlanService.run(testplanRunRequest.getTestPlanId(), testplanRunRequest.getProjectId(), testplanRunRequest.getUserId(), testplanRunRequest.getTriggerMode(), apiRunConfig);