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

fix(测试计划): 修复测试计划执行导入的未选择环境的场景时，校验逻辑判断出错最终导致计划无法正常结束的问题 

--bug=1029266 --user=宋天阳
【测试跟踪】执行计划-报告列表查看-状态仍显示为Running
https://www.tapd.cn/55049933/s/1407134
This commit is contained in:
song-tianyang 2023-08-22 17:39:07 +08:00 committed by 建国
parent 71784c3218
commit a4291470d0
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api-test/backend/src/main/java/io/metersphere/service/ApiJMeterFileService.java
View File

@ -112,9 +112,9 @@ public class ApiJMeterFileService {
private Map<String, String> extractScenarioEnv(String envType, String envJson, String envGroupId) {
Map<String, String> scenarioEnv = new LinkedHashMap<>();
if (envType.equals(EnvironmentType.JSON.name()) && !envJson.isBlank()) {
if (envType.equals(EnvironmentType.JSON.name()) && StringUtils.isNotBlank(envJson)) {
scenarioEnv = JSON.parseObject(envJson, Map.class);
} else if (envType.equals(EnvironmentType.GROUP.name()) && !envGroupId.isBlank()) {
} else if (envType.equals(EnvironmentType.GROUP.name()) && StringUtils.isNotBlank(envGroupId)) {
scenarioEnv = environmentGroupProjectService.getEnvMap(envGroupId);
}
return scenarioEnv;

4
api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioReportService.java
View File

@ -861,9 +861,9 @@ public class ApiScenarioReportService {
private Map<String, String> extractScenarioEnv(String envType, String envJson, String envGroupId) {
Map<String, String> scenarioEnv = new LinkedHashMap<>();
if (envType.equals(EnvironmentType.JSON.name()) && !envJson.isBlank()) {
if (envType.equals(EnvironmentType.JSON.name()) && StringUtils.isNotBlank(envJson)) {
scenarioEnv = JSON.parseObject(envJson, Map.class);
} else if (envType.equals(EnvironmentType.GROUP.name()) && !envGroupId.isBlank()) {
} else if (envType.equals(EnvironmentType.GROUP.name()) && StringUtils.isNotBlank(envGroupId)) {
scenarioEnv = environmentGroupProjectService.getEnvMap(envGroupId);
}
return scenarioEnv;

20
test-track/backend/src/main/java/io/metersphere/plan/service/execute/TestPlanExecuteService.java
View File

@ -175,10 +175,15 @@ public class TestPlanExecuteService {
for (TestPlanApiDTO dto : apiTestCases) {
dto.setReportId(apiCaseReportMap.get(dto.getId()));
}
} else {
redisTemplateService.unlock(testPlanReportId, TestPlanExecuteCaseType.API_CASE.name(), testPlanReportId);
executing = false;
apiTestCases.clear();
}
} catch (Exception e) {
redisTemplateService.unlock(testPlanReportId, TestPlanExecuteCaseType.API_CASE.name(), testPlanReportId);
apiTestCases = null;
executing = false;
LoggerUtil.info("测试报告" + testPlanReportId + "本次执行测试计划接口用例失败！ ", e);
}
}
@ -217,10 +222,16 @@ public class TestPlanExecuteService {
if (CollectionUtils.isNotEmpty(removeDTO)) {
scenarioCases.removeAll(removeDTO);
}
} else {
//如果没有执行的用例，解锁数据，并设置执行数据为空
redisTemplateService.unlock(testPlanReportId, TestPlanExecuteCaseType.SCENARIO.name(), testPlanReportId);
executing = false;
scenarioCases.clear();
}
} catch (Exception e) {
redisTemplateService.unlock(testPlanReportId, TestPlanExecuteCaseType.SCENARIO.name(), testPlanReportId);
scenarioCases = null;
executing = false;
LoggerUtil.info("测试报告" + testPlanReportId + "本次执行测试计划场景用例失败！ ", e);
}
}
@ -249,10 +260,15 @@ public class TestPlanExecuteService {
for (TestPlanUiScenarioDTO dto : uiScenarios) {
dto.setReportId(uiScenarioReportMap.get(dto.getId()));
}
} else {
redisTemplateService.unlock(testPlanReportId, TestPlanExecuteCaseType.UI_SCENARIO.name(), testPlanReportId);
uiScenarios.clear();
executing = false;
}
} catch (Exception e) {
redisTemplateService.unlock(testPlanReportId, TestPlanExecuteCaseType.UI_SCENARIO.name(), testPlanReportId);
uiScenarios = null;
executing = false;
LoggerUtil.info("测试报告" + testPlanReportId + "本次执行测试计划 UI 用例失败！ ", e);
}
}
@ -273,8 +289,12 @@ public class TestPlanExecuteService {
loadCaseReportMap = perfExecService.executeLoadCase(testPlanReportId, runModeConfig, testPlanService.transformationPerfTriggerMode(triggerMode), executeCase);
if (MapUtils.isNotEmpty(loadCaseReportMap)) {
executing = true;
} else {
redisTemplateService.unlock(testPlanReportId, TestPlanExecuteCaseType.LOAD_CASE.name(), testPlanReportId);
executing = false;
}
} catch (Exception e) {
executing = false;
redisTemplateService.unlock(testPlanReportId, TestPlanExecuteCaseType.LOAD_CASE.name(), testPlanReportId);
LoggerUtil.info("测试报告" + testPlanReportId + "本次执行测试计划性能用例失败！ ", e);
}