[inlong] branch master updated: [INLONG-8334][Agent] Optimize agent UT of agent to avoid failed (#8335)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new d153a20f2a [INLONG-8334][Agent] Optimize agent UT of agent to avoid 
failed (#8335)
d153a20f2a is described below

commit d153a20f2ae7a04e9859cfb8e0ff0ca81726a21d
Author: doleyzi <43397300+dole...@users.noreply.github.com>
AuthorDate: Tue Jun 27 07:53:13 2023 -0700

    [INLONG-8334][Agent] Optimize agent UT of agent to avoid failed (#8335)
---
 .../inlong/agent/plugin/task/TestTextFileTask.java      | 17 ++++++++++++++++-
 .../inlong/agent/plugin/trigger/TestTriggerManager.java |  8 ++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git 
a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/task/TestTextFileTask.java
 
b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/task/TestTextFileTask.java
index 4c6ff071c9..32a610fb10 100644
--- 
a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/task/TestTextFileTask.java
+++ 
b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/task/TestTextFileTask.java
@@ -32,6 +32,7 @@ import org.apache.inlong.agent.plugin.channel.MemoryChannel;
 import org.apache.inlong.agent.plugin.sinks.MockSink;
 import org.apache.inlong.agent.plugin.sources.TextFileSource;
 import org.apache.inlong.agent.plugin.sources.reader.file.MonitorTextFile;
+import org.apache.inlong.agent.plugin.trigger.TestTriggerManager;
 import org.apache.inlong.agent.plugin.utils.TestUtils;
 import org.apache.inlong.common.metric.MetricItem;
 import org.apache.inlong.common.metric.MetricRegister;
@@ -48,6 +49,8 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -76,6 +79,7 @@ import static 
org.powermock.api.support.membermodification.MemberMatcher.field;
 @PowerMockIgnore({"javax.management.*"})
 public class TestTextFileTask {
 
+    private static final Logger LOGGER = 
LoggerFactory.getLogger(TestTriggerManager.class);
     public static final TemporaryFolder TMP_FOLDER = new TemporaryFolder();
     private static final Gson GSON = new Gson();
     private static TaskManager taskManager;
@@ -185,7 +189,13 @@ public class TestTextFileTask {
         jobProfile.set(JOB_FILE_META_ENV_LIST, ENV_CVM);
         // mock data
         final MockSink sink = mockTextTask(jobProfile);
+
+        LOGGER.info("sink getResult1 size: {}", sink.getResult().size());
+
         await().atMost(10, TimeUnit.SECONDS).until(() -> 
sink.getResult().size() == 5);
+
+        LOGGER.info("sink getResult2 size: {}", sink.getResult().size());
+
         await().atMost(10, TimeUnit.SECONDS).until(() -> 
MonitorTextFile.getInstance().monitorNum() == 1);
         String testData = IntStream.range(5, 10)
                 .mapToObj(String::valueOf)
@@ -194,7 +204,12 @@ public class TestTextFileTask {
         sb.append(System.lineSeparator());
         TestUtils.write(file.getAbsolutePath(), sb);
 
-        await().atMost(10, TimeUnit.SECONDS).until(() -> 
sink.getResult().size() == 5);
+        LOGGER.info("sink getResult3 size: {}", sink.getResult().size());
+
+        await().atMost(10, TimeUnit.SECONDS).until(() -> 
sink.getResult().size() >= 5);
+
+        LOGGER.info("sink getResult4 size: {}", sink.getResult().size());
+
         synchronized (this) {
             String collectData = sink.getResult().stream().map(message -> {
                 String content = new String(message.getBody(), 
StandardCharsets.UTF_8);
diff --git 
a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/trigger/TestTriggerManager.java
 
b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/trigger/TestTriggerManager.java
index 1e3a19f077..ddb70fc2c3 100644
--- 
a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/trigger/TestTriggerManager.java
+++ 
b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/trigger/TestTriggerManager.java
@@ -92,6 +92,8 @@ public class TestTriggerManager {
 
     @Test
     public void testRestartTriggerJobRestore() throws Exception {
+        agent.cleanupTriggers();
+        agent.cleanupJobs();
 
         TriggerProfile triggerProfile1 = 
TriggerProfile.parseJsonStr(FILE_JOB_TEMPLATE);
         triggerProfile1.set(JobConstants.JOB_ID, "1");
@@ -114,6 +116,9 @@ public class TestTriggerManager {
 
     @Test
     public void testMultiTriggerWatchSameDir() throws Exception {
+        agent.cleanupTriggers();
+        agent.cleanupJobs();
+
         TriggerProfile triggerProfile1 = 
TriggerProfile.parseJsonStr(FILE_JOB_TEMPLATE);
         triggerProfile1.set(JobConstants.JOB_ID, "1");
         triggerProfile1.set(JobConstants.JOB_DIR_FILTER_PATTERNS,
@@ -138,6 +143,9 @@ public class TestTriggerManager {
 
     @Test
     public void testSubmitAndShutdown() throws Exception {
+        agent.cleanupTriggers();
+        agent.cleanupJobs();
+
         TriggerProfile triggerProfile1 = 
TriggerProfile.parseJsonStr(FILE_JOB_TEMPLATE);
         triggerProfile1.set(JobConstants.JOB_ID, "1");
         triggerProfile1.set(JobConstants.JOB_DIR_FILTER_PATTERNS,