test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-02 03:58:33 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.6' into v1.6

Browse Source
This commit is contained in:
song.tianyang 2020-12-29 15:19:47 +08:00
commit f1564b5751
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -24,7 +24,6 @@ import io.metersphere.base.mapper.ext.ExtTestPlanScenarioCaseMapper;
import io.metersphere.commons.constants.*;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.DateUtils;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.commons.utils.ServiceUtils;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.i18n.Translator;
@ -316,6 +315,10 @@ public class ApiAutomationService {
try {
boolean isFirst = true;
for (ApiScenarioWithBLOBs item : apiScenarios) {
if (item.getStepTotal() == 0) {
MSException.throwException(item.getName() + "，" + Translator.get("automation_exec_info"));
break;
}
MsThreadGroup group = new MsThreadGroup();
group.setLabel(item.getName());
group.setName(UUID.randomUUID().toString());
@ -353,7 +356,7 @@ public class ApiAutomationService {
}
} catch (Exception ex) {
LogUtil.error(ex.getMessage());
MSException.throwException(ex.getMessage());
}
testPlan.toHashTree(jmeterHashTree, testPlan.getHashTree(), new ParameterConfig());

2
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -177,6 +177,6 @@ task_notification=Result notification
message_task_already_exists=Task recipient already exists
#automation
automation_name_already_exists=the scenario already exists in the project and the module
automation_exec_info=There are no test steps to execute

3
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -177,4 +177,5 @@ task_notification_jenkins=jenkins任务通知
task_notification=任务通知
message_task_already_exists=任务接收人已经存在
#automation
automation_name_already_exists=同一个项目和模块下，场景名称不能重复
automation_name_already_exists=同一个项目和模块下，场景名称不能重复
automation_exec_info=没有测试步骤，无法执行

1
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -179,3 +179,4 @@ api_definition_url_not_repeating=接口請求地址已經存在
message_task_already_exists=任務接收人已經存在
#automation
automation_name_already_exists=同一個項目和模塊下，場景名稱不能重複
automation_exec_info=沒有測試步驟，無法執行