[FLINK-8904][cli][tests] Restore previous sysout This closes #5670.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/80ee2673 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/80ee2673 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/80ee2673 Branch: refs/heads/master Commit: 80ee267386a3bc3c27c95a628255031953506128 Parents: 9898d43 Author: Nico Kruber <[email protected]> Authored: Tue Mar 6 11:43:32 2018 +0100 Committer: zentol <[email protected]> Committed: Wed Mar 14 20:46:23 2018 +0100 ---------------------------------------------------------------------- .../org/apache/flink/client/cli/CliFrontendCancelTest.java | 6 ++++++ .../org/apache/flink/client/cli/CliFrontendListTest.java | 6 ++++++ .../flink/client/cli/CliFrontendPackageProgramTest.java | 9 +++++++-- .../org/apache/flink/client/cli/CliFrontendRunTest.java | 6 ++++++ .../org/apache/flink/client/cli/CliFrontendStopTest.java | 9 +++++++-- .../org/apache/flink/client/cli/CliFrontendTestUtils.java | 6 ++++++ 6 files changed, 38 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/80ee2673/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendCancelTest.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendCancelTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendCancelTest.java index b2fa003..837c564 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendCancelTest.java +++ b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendCancelTest.java @@ -24,6 +24,7 @@ import org.apache.flink.client.program.ClusterClient; import org.apache.flink.configuration.Configuration; import org.apache.flink.util.TestLogger; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; @@ -46,6 +47,11 @@ public class CliFrontendCancelTest extends TestLogger { CliFrontendTestUtils.pipeSystemOutToNull(); } + @AfterClass + public static void shutdown() { + CliFrontendTestUtils.restoreSystemOut(); + } + @Test public void testCancel() throws Exception { // test cancel properly http://git-wip-us.apache.org/repos/asf/flink/blob/80ee2673/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendListTest.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendListTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendListTest.java index 760b376..42399cb 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendListTest.java +++ b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendListTest.java @@ -23,6 +23,7 @@ import org.apache.flink.client.program.ClusterClient; import org.apache.flink.configuration.Configuration; import org.apache.flink.util.TestLogger; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; @@ -44,6 +45,11 @@ public class CliFrontendListTest extends TestLogger { CliFrontendTestUtils.pipeSystemOutToNull(); } + @AfterClass + public static void shutdown() { + CliFrontendTestUtils.restoreSystemOut(); + } + @Test public void testList() throws Exception { // test list properly http://git-wip-us.apache.org/repos/asf/flink/blob/80ee2673/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java index 6873e68..48c8891 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java +++ b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java @@ -27,6 +27,7 @@ import org.apache.flink.optimizer.Optimizer; import org.apache.flink.optimizer.costs.DefaultCostEstimator; import org.apache.flink.util.TestLogger; +import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -40,7 +41,6 @@ import static org.apache.flink.client.cli.CliFrontendTestUtils.TEST_JAR_CLASSLOA import static org.apache.flink.client.cli.CliFrontendTestUtils.TEST_JAR_MAIN_CLASS; import static org.apache.flink.client.cli.CliFrontendTestUtils.getNonJarFilePath; import static org.apache.flink.client.cli.CliFrontendTestUtils.getTestJarPath; -import static org.apache.flink.client.cli.CliFrontendTestUtils.pipeSystemOutToNull; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -58,7 +58,12 @@ public class CliFrontendPackageProgramTest extends TestLogger { @BeforeClass public static void init() { - pipeSystemOutToNull(); + CliFrontendTestUtils.pipeSystemOutToNull(); + } + + @AfterClass + public static void shutdown() { + CliFrontendTestUtils.restoreSystemOut(); } @Before http://git-wip-us.apache.org/repos/asf/flink/blob/80ee2673/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendRunTest.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendRunTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendRunTest.java index 69724f1..c7789a8 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendRunTest.java +++ b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendRunTest.java @@ -25,6 +25,7 @@ import org.apache.flink.configuration.GlobalConfiguration; import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings; import org.apache.flink.util.TestLogger; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -45,6 +46,11 @@ public class CliFrontendRunTest extends TestLogger { CliFrontendTestUtils.pipeSystemOutToNull(); } + @AfterClass + public static void shutdown() { + CliFrontendTestUtils.restoreSystemOut(); + } + @Test public void testRun() throws Exception { final Configuration configuration = GlobalConfiguration.loadConfiguration(CliFrontendTestUtils.getConfigDir()); http://git-wip-us.apache.org/repos/asf/flink/blob/80ee2673/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendStopTest.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendStopTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendStopTest.java index d6049e5..ec4ccdc 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendStopTest.java +++ b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendStopTest.java @@ -26,6 +26,7 @@ import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FlinkException; import org.apache.flink.util.TestLogger; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; @@ -34,7 +35,6 @@ import javax.annotation.Nullable; import java.util.Collections; -import static org.apache.flink.client.cli.CliFrontendTestUtils.pipeSystemOutToNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; @@ -49,7 +49,12 @@ public class CliFrontendStopTest extends TestLogger { @BeforeClass public static void setup() { - pipeSystemOutToNull(); + CliFrontendTestUtils.pipeSystemOutToNull(); + } + + @AfterClass + public static void shutdown() { + CliFrontendTestUtils.restoreSystemOut(); } @Test http://git-wip-us.apache.org/repos/asf/flink/blob/80ee2673/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestUtils.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestUtils.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestUtils.java index 16737dd..b47986f 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestUtils.java +++ b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendTestUtils.java @@ -41,6 +41,8 @@ public class CliFrontendTestUtils { public static final int TEST_JOB_MANAGER_PORT = 55443; + private static final PrintStream previousSysout = System.out; + public static String getTestJarPath() throws FileNotFoundException, MalformedURLException { File f = new File("target/maven-test-jar.jar"); if (!f.exists()) { @@ -68,6 +70,10 @@ public class CliFrontendTestUtils { System.setOut(new PrintStream(new BlackholeOutputSteam())); } + public static void restoreSystemOut() { + System.setOut(previousSysout); + } + private static final class BlackholeOutputSteam extends java.io.OutputStream { @Override public void write(int b){}
