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

fix(接口自动化): 修复接口测试-场景，引用接口用例数据会消失问题

This commit is contained in:
fit2-zhao 2021-07-01 11:33:29 +08:00 committed by fit2-zhao
parent c98fdc68b8
commit 7414d2bbe6
3 changed files with 117 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ public class ParallelExecTask<T> implements Callable<T> {
TestPlanLoadCase testPlanLoadCase = new TestPlanLoadCase(); TestPlanLoadCase testPlanLoadCase = new TestPlanLoadCase();
testPlanLoadCase.setId(request.getTestPlanLoadId()); testPlanLoadCase.setId(request.getTestPlanLoadId());
testPlanLoadCase.setLoadReportId(reportId); testPlanLoadCase.setLoadReportId(reportId);
testPlanLoadCase.setStatus("run");
testPlanLoadCaseMapper.updateByPrimaryKeySelective(testPlanLoadCase); testPlanLoadCaseMapper.updateByPrimaryKeySelective(testPlanLoadCase);
return (T) reportId; return (T) reportId;

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

@ -38,6 +38,7 @@ public class SerialExecTask<T> implements Callable<T> {
TestPlanLoadCase testPlanLoadCase = new TestPlanLoadCase(); TestPlanLoadCase testPlanLoadCase = new TestPlanLoadCase();
testPlanLoadCase.setId(request.getTestPlanLoadId()); testPlanLoadCase.setId(request.getTestPlanLoadId());
testPlanLoadCase.setLoadReportId(reportId); testPlanLoadCase.setLoadReportId(reportId);
testPlanLoadCase.setStatus("run");
testPlanLoadCaseMapper.updateByPrimaryKeySelective(testPlanLoadCase); testPlanLoadCaseMapper.updateByPrimaryKeySelective(testPlanLoadCase);
LoadTestReportWithBLOBs report = null; LoadTestReportWithBLOBs report = null;
// 轮询查看报告状态，最多200次，防止死循环 // 轮询查看报告状态，最多200次，防止死循环

2
frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
View File

@ -216,6 +216,8 @@ export default {
if (this.isTestPlan) { if (this.isTestPlan) {
url = '/test/plan/api/case/relevance/list/'; url = '/test/plan/api/case/relevance/list/';
this.condition.planId = this.planId; this.condition.planId = this.planId;
} else {
this.condition.ids = [];
} }
this.result = this.$post(url + this.currentPage + "/" + this.pageSize, this.condition, response => { this.result = this.$post(url + this.currentPage + "/" + this.pageSize, this.condition, response => {