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

fix(接口测试): 修复node执行中序列化问题 

--bug=1017866 --user=赵勇 【接口测试】接口case列表中批量执行10个case-串行-node资源池-失败停止，结果执行失败 https://www.tapd.cn/55049933/s/1259265
This commit is contained in:
fit2-zhao 2022-10-12 11:41:42 +08:00 committed by f2c-ci-robot[bot]
parent 6876d9b9d5
commit 9b1ab5c1fd
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseParallelExecuteService.java
View File

@ -3,7 +3,7 @@ package io.metersphere.api.exec.api;
import io.metersphere.api.exec.queue.DBTestQueue; import io.metersphere.api.exec.queue.DBTestQueue;
import io.metersphere.commons.utils.GenerateHashTreeUtil; import io.metersphere.commons.utils.GenerateHashTreeUtil;
import io.metersphere.api.jmeter.JMeterService; import io.metersphere.api.jmeter.JMeterService;
import io.metersphere.api.jmeter.algorithm.SmoothWeighted; import io.metersphere.api.jmeter.utils.SmoothWeighted;
import io.metersphere.base.domain.ApiDefinitionExecResultWithBLOBs; import io.metersphere.base.domain.ApiDefinitionExecResultWithBLOBs;
import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.constants.RunModeConstants; import io.metersphere.constants.RunModeConstants;

2
api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseSerialService.java
View File

@ -14,7 +14,7 @@ import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
import io.metersphere.api.exec.queue.DBTestQueue; import io.metersphere.api.exec.queue.DBTestQueue;
import io.metersphere.api.jmeter.JMeterService; import io.metersphere.api.jmeter.JMeterService;
import io.metersphere.api.jmeter.NewDriverManager; import io.metersphere.api.jmeter.NewDriverManager;
import io.metersphere.api.jmeter.algorithm.SmoothWeighted; import io.metersphere.api.jmeter.utils.SmoothWeighted;
import io.metersphere.service.ApiExecutionQueueService; import io.metersphere.service.ApiExecutionQueueService;
import io.metersphere.service.RemakeReportService; import io.metersphere.service.RemakeReportService;
import io.metersphere.base.domain.ApiDefinitionExecResultWithBLOBs; import io.metersphere.base.domain.ApiDefinitionExecResultWithBLOBs;

2
api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java
View File

@ -5,7 +5,7 @@ import io.metersphere.api.dto.automation.RunScenarioRequest;
import io.metersphere.api.exec.queue.DBTestQueue; import io.metersphere.api.exec.queue.DBTestQueue;
import io.metersphere.commons.utils.GenerateHashTreeUtil; import io.metersphere.commons.utils.GenerateHashTreeUtil;
import io.metersphere.api.jmeter.JMeterService; import io.metersphere.api.jmeter.JMeterService;
import io.metersphere.api.jmeter.algorithm.SmoothWeighted; import io.metersphere.api.jmeter.utils.SmoothWeighted;
import io.metersphere.constants.RunModeConstants; import io.metersphere.constants.RunModeConstants;
import io.metersphere.dto.BaseSystemConfigDTO; import io.metersphere.dto.BaseSystemConfigDTO;
import io.metersphere.dto.JmeterRunRequestDTO; import io.metersphere.dto.JmeterRunRequestDTO;

2
api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java
View File

@ -3,7 +3,7 @@ package io.metersphere.api.exec.scenario;
import io.metersphere.api.exec.queue.DBTestQueue; import io.metersphere.api.exec.queue.DBTestQueue;
import io.metersphere.api.jmeter.JMeterService; import io.metersphere.api.jmeter.JMeterService;
import io.metersphere.api.jmeter.algorithm.SmoothWeighted; import io.metersphere.api.jmeter.utils.SmoothWeighted;
import io.metersphere.base.domain.ApiExecutionQueueDetail; import io.metersphere.base.domain.ApiExecutionQueueDetail;
import io.metersphere.base.domain.ApiScenarioReport; import io.metersphere.base.domain.ApiScenarioReport;
import io.metersphere.base.domain.ApiScenarioWithBLOBs; import io.metersphere.base.domain.ApiScenarioWithBLOBs;

4
api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
View File

@ -3,8 +3,8 @@ package io.metersphere.api.jmeter;
import io.metersphere.api.exec.engine.EngineFactory; import io.metersphere.api.exec.engine.EngineFactory;
import io.metersphere.api.exec.queue.ExecThreadPoolExecutor; import io.metersphere.api.exec.queue.ExecThreadPoolExecutor;
import io.metersphere.api.jmeter.algorithm.ServerConfig; import io.metersphere.api.jmeter.utils.ServerConfig;
import io.metersphere.api.jmeter.algorithm.SmoothWeighted; import io.metersphere.api.jmeter.utils.SmoothWeighted;
import io.metersphere.commons.config.KafkaConfig; import io.metersphere.commons.config.KafkaConfig;
import io.metersphere.service.RemakeReportService; import io.metersphere.service.RemakeReportService;
import io.metersphere.commons.constants.ApiRunMode; import io.metersphere.commons.constants.ApiRunMode;

2
api-test/backend/src/main/java/io/metersphere/api/jmeter/algorithm/ServerConfig.java → api-test/backend/src/main/java/io/metersphere/api/jmeter/utils/ServerConfig.java
View File

@ -1,4 +1,4 @@
package io.metersphere.api.jmeter.algorithm; package io.metersphere.api.jmeter.utils;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

2
api-test/backend/src/main/java/io/metersphere/api/jmeter/algorithm/SmoothWeighted.java → api-test/backend/src/main/java/io/metersphere/api/jmeter/utils/SmoothWeighted.java
View File

@ -1,4 +1,4 @@
package io.metersphere.api.jmeter.algorithm; package io.metersphere.api.jmeter.utils;
import io.metersphere.commons.utils.GenerateHashTreeUtil; import io.metersphere.commons.utils.GenerateHashTreeUtil;