From ec0fa5f0cf2ff23660221c4fb38d83cb972f53aa Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Tue, 7 Apr 2020 17:46:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=AA=8C=E8=AF=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/engine/docker/DockerTestEngine.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java b/backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java index 2e555fbdbb..06c7892170 100644 --- a/backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java +++ b/backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java @@ -12,10 +12,8 @@ import io.metersphere.engine.EngineContext; import io.metersphere.engine.EngineFactory; import io.metersphere.engine.docker.request.BaseRequest; import io.metersphere.engine.docker.request.TestRequest; -import org.apache.commons.lang3.StringUtils; import org.springframework.web.client.RestTemplate; -import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; @@ -83,16 +81,6 @@ public class DockerTestEngine extends AbstractEngine { testRequest.setImage(JMETER_IMAGE); testRequest.setTestData(context.getTestData()); - // todo 判断测试状态 - String taskStatusUri = String.format(BASE_URL + "/jmeter/task/status/" + testId, nodeIp, port); - List containerList = restTemplate.postForObject(taskStatusUri, testRequest, List.class); - for (int i = 0; i < containerList.size(); i++) { - HashMap h = (HashMap) containerList.get(i); - if (StringUtils.equals((String) h.get("State"), "running")) { - MSException.throwException("The test is running!"); - } - } - restTemplate.postForObject(uri, testRequest, String.class); }