Repository: oozie Updated Branches: refs/heads/master ba5c3c909 -> 6af262bfb
OOZIE-2958 TestLauncherAM fails in Share Lib Oozie (pbacsko) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6af262bf Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6af262bf Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6af262bf Branch: refs/heads/master Commit: 6af262bfbd8b0db82920c0cc4c26cd167afff03b Parents: ba5c3c9 Author: Peter Bacsko <pbac...@cloudera.com> Authored: Mon Jul 31 13:54:10 2017 +0200 Committer: Peter Bacsko <pbac...@cloudera.com> Committed: Mon Jul 31 13:54:10 2017 +0200 ---------------------------------------------------------------------- release-log.txt | 1 + .../java/org/apache/oozie/action/hadoop/TestLauncherMain.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/6af262bf/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 64b9b1e..04791d9 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-2958 TestLauncherAM fails in Share Lib Oozie (pbacsko) OOZIE-2662 DB migration fails if database is too big (andras.piros via gezapeti) OOZIE-2984 Parse spark-defaults.conf values with spaces without needing the quotes (andras.piros via gezapeti) OOZIE-2910 Re-add testChildKill and adapt it to OYA (pbacsko and gezapeti) http://git-wip-us.apache.org/repos/asf/oozie/blob/6af262bf/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherMain.java ---------------------------------------------------------------------- diff --git a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherMain.java b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherMain.java index 1e23dbd..a793df1 100644 --- a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherMain.java +++ b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherMain.java @@ -30,15 +30,17 @@ import static org.junit.Assert.assertTrue; public class TestLauncherMain { private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); + private PrintStream originalStream; @Before public void setUpStreams() { + originalStream = System.out; System.setOut(new PrintStream(outContent)); } @After public void cleanUpStreams() { - System.setOut(null); + System.setOut(originalStream); } @Test
