You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2021/06/08 15:57:05 UTC

[flink] branch release-1.13 updated (ed02b5d -> 7b1923d)

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

trohrmann pushed a change to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git.


    from ed02b5d  [FLINK-22856][Azure] Upgrade to ubuntu-20.04
     new 1a55cae  [FLINK-22496][tests] Harden ClusterEntrypointTest.testCloseAsyncShouldBeExecutedInShutdownHook
     new 3660748  [FLINK-22496][tests] Include log output from started process in ClusterEntrypointTest.testCloseAsyncShouldBeExecutedInShutdownHook
     new 7b1923d  [hotfix] Replace deprecated import org.junit.Assert.assertThat with org.hamcrest.MatcherAssert.assertThat

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../flink/runtime/entrypoint/ClusterEntrypointTest.java    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

[flink] 01/03: [FLINK-22496][tests] Harden ClusterEntrypointTest.testCloseAsyncShouldBeExecutedInShutdownHook

Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

trohrmann pushed a commit to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 1a55cae23b3c1e943298ca4a93cad2704994e29b
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Tue Jun 8 12:42:18 2021 +0200

    [FLINK-22496][tests] Harden ClusterEntrypointTest.testCloseAsyncShouldBeExecutedInShutdownHook
    
    Hardens the ClusterEntrypointTest.testCloseAsyncShouldBeExecutedInShutdownHook by increasing the timeout from 3s to 10s.
---
 .../java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java
index db497bd..a8c4d02 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java
@@ -88,7 +88,7 @@ import static org.junit.Assume.assumeTrue;
 /** Tests for the {@link ClusterEntrypoint}. */
 public class ClusterEntrypointTest extends TestLogger {
 
-    private static final long TIMEOUT_MS = 3000;
+    private static final long TIMEOUT_MS = 10000;
 
     private Configuration flinkConfig;
 

[flink] 02/03: [FLINK-22496][tests] Include log output from started process in ClusterEntrypointTest.testCloseAsyncShouldBeExecutedInShutdownHook

Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

trohrmann pushed a commit to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 3660748b252e8de1553305dc326fc38065756951
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Tue Jun 8 12:52:08 2021 +0200

    [FLINK-22496][tests] Include log output from started process in ClusterEntrypointTest.testCloseAsyncShouldBeExecutedInShutdownHook
    
    This closes #16111.
---
 .../apache/flink/runtime/entrypoint/ClusterEntrypointTest.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java
index a8c4d02..ec1281d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java
@@ -209,8 +209,11 @@ public class ClusterEntrypointTest extends TestLogger {
         final File markerFile = new File(TEMPORARY_FOLDER.getRoot(), UUID.randomUUID() + ".marker");
         final TestingClusterEntrypointProcess clusterEntrypointProcess =
                 new TestingClusterEntrypointProcess(markerFile);
+
+        clusterEntrypointProcess.startProcess();
+
+        boolean success = false;
         try {
-            clusterEntrypointProcess.startProcess();
             final long pid = clusterEntrypointProcess.getProcessId();
             assertTrue("Cannot determine process ID", pid != -1);
 
@@ -229,7 +232,12 @@ public class ClusterEntrypointTest extends TestLogger {
                     "markerFile should be deleted in closeAsync shutdownHook",
                     markerFile.exists(),
                     is(false));
+            success = true;
         } finally {
+            if (!success) {
+                clusterEntrypointProcess.printProcessLog();
+            }
+
             clusterEntrypointProcess.destroy();
         }
     }

[flink] 03/03: [hotfix] Replace deprecated import org.junit.Assert.assertThat with org.hamcrest.MatcherAssert.assertThat

Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

trohrmann pushed a commit to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 7b1923dbfb160fb8b97244d4e2dc6fd98a9432ac
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Tue Jun 8 12:52:57 2021 +0200

    [hotfix] Replace deprecated import org.junit.Assert.assertThat with org.hamcrest.MatcherAssert.assertThat
---
 .../java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java
index ec1281d..bc55203 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/ClusterEntrypointTest.java
@@ -80,7 +80,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;