From b66448f8023fe55874a2d3c0cb18d7ceabb2a1d0 Mon Sep 17 00:00:00 2001
From: yoyama <you.yamagata@treasure-data.com>
Date: Mon, 18 Apr 2022 12:51:22 +0900
Subject: [PATCH] Fix PyIT retry again.

In addition fix an issue on initialize and shutdown of TemporalDigdagServer.
---
 .../src/test/java/acceptance/td/PyIT.java     | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/digdag-tests/src/test/java/acceptance/td/PyIT.java b/digdag-tests/src/test/java/acceptance/td/PyIT.java
index e3bf95f6bc..2c87990bd2 100644
--- a/digdag-tests/src/test/java/acceptance/td/PyIT.java
+++ b/digdag-tests/src/test/java/acceptance/td/PyIT.java
@@ -5,6 +5,7 @@
 import io.digdag.client.api.Id;
 import io.digdag.client.api.RestSessionAttempt;
 import io.digdag.client.config.Config;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -34,8 +35,8 @@ public class PyIT
 
     @Rule
     public TemporaryFolder folder = new TemporaryFolder();
-    @Rule
-    public TemporaryDigdagServer server = TemporaryDigdagServer.of();
+    // Not set Rule. It is initialized in setUp()
+    public TemporaryDigdagServer server;
 
     private String accessKeyId;
     private String secretAccessKey;
@@ -101,6 +102,16 @@ public void setUp()
                 .build();
     }
 
+    @After
+    public void stopServer()
+            throws Exception
+    {
+        if (server != null) {
+            server.close();
+            server = null;
+        }
+    }
+
     @Test
     public void testRunOnEcsWithRetry()
             throws Exception
@@ -111,14 +122,16 @@ public void testRunOnEcsWithRetry()
                 testRunOnEcs();
                 return;
             } catch (AssertionError ae) {
-                logger.warn("testRunOnEcs() failed. {}", ae.toString());
+                logger.error("testRunOnEcs() failed. {}", ae.toString());
                 if (i + 1 == MAX_RETRY) {
                     logger.error("All try of testRunOnEcs() failed.");
                     throw ae;
                 }
                 else {
-                    logger.warn("Retrying...");
+                    logger.error("Retrying...");
+                    server.close();
                     Thread.sleep(10*1000);
+                    setUp();
                 }
             }
         }