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

fix(测试计划): 执行性能测试用例失败时状态未记录 

--bug=1008758 --user=lyh 【测试跟踪】手动执行测试计划，性能测试没有执行
https://www.tapd.cn/55049933/s/1081054
This commit is contained in:
shiziyuan9527 2021-12-15 14:25:47 +08:00 committed by shiziyuan9527
parent d37f90ba8a
commit 2841335576
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/io/metersphere/commons/constants/TestPlanLoadCaseStatus.java Normal file
View File

@ -0,0 +1,5 @@
package io.metersphere.commons.constants;
public enum TestPlanLoadCaseStatus {
run, error, success
}

5
backend/src/main/java/io/metersphere/track/service/LoadReportStatusEvent.java
View File

@ -4,6 +4,7 @@ import io.metersphere.base.domain.LoadTestReport;
import io.metersphere.base.mapper.ext.ExtTestPlanLoadCaseMapper; import io.metersphere.base.mapper.ext.ExtTestPlanLoadCaseMapper;
import io.metersphere.commons.constants.PerformanceTestStatus; import io.metersphere.commons.constants.PerformanceTestStatus;
import io.metersphere.commons.constants.ReportTriggerMode; import io.metersphere.commons.constants.ReportTriggerMode;
import io.metersphere.commons.constants.TestPlanLoadCaseStatus;
import io.metersphere.commons.consumer.LoadTestFinishEvent; import io.metersphere.commons.consumer.LoadTestFinishEvent;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -24,10 +25,10 @@ public class LoadReportStatusEvent implements LoadTestFinishEvent {
if (StringUtils.isNotBlank(reportId)) { if (StringUtils.isNotBlank(reportId)) {
String result = ""; String result = "";
if (StringUtils.equals(PerformanceTestStatus.Error.name(), status)) { if (StringUtils.equals(PerformanceTestStatus.Error.name(), status)) {
result = "error"; result = TestPlanLoadCaseStatus.error.name();
} }
if (StringUtils.equals(PerformanceTestStatus.Completed.name(), status)) { if (StringUtils.equals(PerformanceTestStatus.Completed.name(), status)) {
result = "success"; result = TestPlanLoadCaseStatus.success.name();
} }
extTestPlanLoadCaseMapper.updateCaseStatus(reportId, result); extTestPlanLoadCaseMapper.updateCaseStatus(reportId, result);
} }

6
backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
View File

@ -898,7 +898,7 @@ public class TestPlanReportService {
if (errorDataCheckMap.get(loadTestReportId) > 10) { if (errorDataCheckMap.get(loadTestReportId) > 10) {
performaneReportIDList.remove(loadTestReportId); performaneReportIDList.remove(loadTestReportId);
if (performaneReportIDMap.containsKey(loadTestReportId)) { if (performaneReportIDMap.containsKey(loadTestReportId)) {
finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanApiExecuteStatus.FAILD.name()); finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanLoadCaseStatus.error.name());
caseReportMap.put(performaneReportIDMap.get(loadTestReportId), loadTestReportId); caseReportMap.put(performaneReportIDMap.get(loadTestReportId), loadTestReportId);
} }
} else { } else {
@ -911,14 +911,14 @@ public class TestPlanReportService {
testPlanLog.info("TestPlanReportId[" + testPlanReport.getId() + "] SELECT performance ID:" + loadTestReportId + ",RESULT :" + loadTestReportFromDatabase.getStatus()); testPlanLog.info("TestPlanReportId[" + testPlanReport.getId() + "] SELECT performance ID:" + loadTestReportId + ",RESULT :" + loadTestReportFromDatabase.getStatus());
if (StringUtils.equalsAny(loadTestReportFromDatabase.getStatus(), if (StringUtils.equalsAny(loadTestReportFromDatabase.getStatus(),
PerformanceTestStatus.Completed.name(), PerformanceTestStatus.Error.name())) { PerformanceTestStatus.Completed.name(), PerformanceTestStatus.Error.name())) {
finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanApiExecuteStatus.SUCCESS.name()); finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanLoadCaseStatus.success.name());
caseReportMap.put(performaneReportIDMap.get(loadTestReportId), loadTestReportId); caseReportMap.put(performaneReportIDMap.get(loadTestReportId), loadTestReportId);
performaneReportIDList.remove(loadTestReportId); performaneReportIDList.remove(loadTestReportId);
} }
} }
} catch (Exception e) { } catch (Exception e) {
performaneReportIDList.remove(loadTestReportId); performaneReportIDList.remove(loadTestReportId);
finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanApiExecuteStatus.FAILD.name()); finishLoadTestId.put(performaneReportIDMap.get(loadTestReportId), TestPlanLoadCaseStatus.error.name());
caseReportMap.put(performaneReportIDMap.get(loadTestReportId), loadTestReportId); caseReportMap.put(performaneReportIDMap.get(loadTestReportId), loadTestReportId);
testPlanLog.error(e.getMessage()); testPlanLog.error(e.getMessage());
} }

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

@ -1172,19 +1172,19 @@ public class TestPlanService {
reportId = performanceTestService.run(performanceRequest); reportId = performanceTestService.run(performanceRequest);
if (reportId != null) { if (reportId != null) {
performaneReportIDMap.put(reportId, id); performaneReportIDMap.put(reportId, id);
TestPlanLoadCaseWithBLOBs testPlanLoadCase = new TestPlanLoadCaseWithBLOBs();
testPlanLoadCase.setId(performanceRequest.getTestPlanLoadId());
testPlanLoadCase.setLoadReportId(reportId);
testPlanLoadCaseService.update(testPlanLoadCase);
//更新关联处的报告 //更新关联处的报告
TestPlanLoadCaseWithBLOBs loadCase = new TestPlanLoadCaseDTO(); TestPlanLoadCaseWithBLOBs loadCase = new TestPlanLoadCaseDTO();
loadCase.setId(id); loadCase.setId(id);
loadCase.setLoadReportId(reportId); loadCase.setLoadReportId(reportId);
loadCase.setStatus("run"); loadCase.setStatus(TestPlanLoadCaseStatus.run.name());
testPlanLoadCaseService.update(loadCase); testPlanLoadCaseService.update(loadCase);
} }
} catch (Exception e) { } catch (Exception e) {
TestPlanLoadCaseWithBLOBs testPlanLoadCase = new TestPlanLoadCaseWithBLOBs();
testPlanLoadCase.setId(id);
testPlanLoadCase.setLoadReportId(reportId);
testPlanLoadCase.setStatus(TestPlanLoadCaseStatus.error.name());
testPlanLoadCaseService.update(testPlanLoadCase);
LogUtil.error(e); LogUtil.error(e);
} }
performaneThreadIDMap.put(performanceRequest.getTestPlanLoadId(), reportId); performaneThreadIDMap.put(performanceRequest.getTestPlanLoadId(), reportId);