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

fix(接口测试): 修复批量执行场景时CSV文件丢失处理 

--bug=1013783 --user=赵勇 【接口测试】带csv的场景，删除服务器上的csv文件，并行执行，会一直running https://www.tapd.cn/55049933/s/1172922
This commit is contained in:
fit2-zhao 2022-06-02 17:53:20 +08:00 committed by f2c-ci-robot[bot]
parent 1cb0965d5a
commit a83c50881c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
View File

@ -152,15 +152,16 @@ public class GenerateHashTreeUtil {
group.setHashTree(scenarios); group.setHashTree(scenarios);
testPlan.getHashTree().add(group); testPlan.getHashTree().add(group);
ParameterConfig config = new ParameterConfig();
config.setScenarioId(item.getId());
config.setReportType(runRequest.getReportType());
testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), config);
LoggerUtil.info("报告ID" + runRequest.getReportId() + " 场景资源：" + item.getName() + ", 生成执行脚本JMX成功"); LoggerUtil.info("报告ID" + runRequest.getReportId() + " 场景资源：" + item.getName() + ", 生成执行脚本JMX成功");
} catch (Exception ex) { } catch (Exception ex) {
remakeException(runRequest); remakeException(runRequest);
LoggerUtil.error("报告ID" + runRequest.getReportId() + " 场景资源：" + item.getName() + ", 生成执行脚本失败", ex); LoggerUtil.error("报告ID" + runRequest.getReportId() + " 场景资源：" + item.getName() + ", 生成执行脚本失败", ex);
} }
ParameterConfig config = new ParameterConfig();
config.setScenarioId(item.getId());
config.setReportType(runRequest.getReportType());
testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), config);
LogUtil.info(testPlan.getJmx(jmeterHashTree)); LogUtil.info(testPlan.getJmx(jmeterHashTree));
return jmeterHashTree; return jmeterHashTree;