Try something
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5b580aaa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5b580aaa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5b580aaa Branch: refs/heads/branch-2-jhung-test Commit: 5b580aaa7e16048b162838d77bb48c5e9fddbaba Parents: 5c02975 Author: Jonathan Hung <[email protected]> Authored: Fri Dec 14 16:02:55 2018 -0800 Committer: Jonathan Hung <[email protected]> Committed: Fri Dec 14 16:03:56 2018 -0800 ---------------------------------------------------------------------- .../apache/hadoop/cli/util/CommandExecutor.java | 8 +- .../apache/hadoop/crypto/key/TestKeyShell.java | 8 +- .../apache/hadoop/fs/TestFsShellReturnCode.java | 16 ++-- .../java/org/apache/hadoop/fs/TestTrash.java | 8 +- .../hadoop/fs/shell/TestXAttrCommands.java | 4 +- .../hadoop/ipc/TestDecayRpcScheduler.java | 4 +- .../hadoop/security/alias/TestCredShell.java | 4 +- .../apache/hadoop/test/GenericTestUtils.java | 4 +- .../org/apache/hadoop/util/TestClasspath.java | 8 +- .../hadoop/util/TestNativeLibraryChecker.java | 4 +- .../crypto/key/kms/server/TestKMSAudit.java | 4 +- .../federation/router/TestRouterAdminCLI.java | 18 ++-- .../org/apache/hadoop/hdfs/DFSTestUtil.java | 8 +- .../hadoop/hdfs/TestBalancerBandwidth.java | 4 +- .../org/apache/hadoop/hdfs/TestDFSShell.java | 88 ++++++++++---------- .../hadoop/hdfs/TestFsShellPermission.java | 4 +- .../hadoop/hdfs/TestMaintenanceState.java | 4 +- .../java/org/apache/hadoop/hdfs/TestQuota.java | 12 +-- .../hdfs/server/namenode/TestClusterId.java | 12 +-- .../namenode/TestDecommissioningStatus.java | 4 +- .../namenode/TestMetadataVersionOutput.java | 4 +- .../namenode/snapshot/TestSnapshotDeletion.java | 8 +- .../snapshot/TestSnapshotFileLength.java | 8 +- .../namenode/snapshot/TestSnapshotRename.java | 8 +- .../apache/hadoop/hdfs/tools/TestDFSAdmin.java | 8 +- .../hadoop/hdfs/tools/TestDFSAdminWithHA.java | 8 +- .../hadoop/hdfs/tools/TestDebugAdmin.java | 8 +- .../TestOfflineEditsViewer.java | 4 +- .../TestOfflineImageViewer.java | 12 +-- .../org/apache/hadoop/tools/TestJMXGet.java | 4 +- .../java/org/apache/hadoop/tools/TestTools.java | 8 +- .../apache/hadoop/tracing/TestTraceAdmin.java | 8 +- .../mapreduce/v2/hs/TestJobHistoryParsing.java | 4 +- .../apache/hadoop/mapred/TestNetworkedJob.java | 10 +-- .../mapred/pipes/TestPipeApplication.java | 6 +- .../hadoop/mapreduce/TestMRJobClient.java | 8 +- .../java/org/apache/hadoop/ant/DfsTask.java | 8 +- .../apache/hadoop/tools/TestHadoopArchives.java | 12 +-- .../hadoop/tools/TestDistCpSyncReverseBase.java | 8 +- .../apache/hadoop/tools/TestDistCpSystem.java | 4 +- .../org/apache/hadoop/tools/TestCopyFiles.java | 4 +- .../org/apache/hadoop/tools/TestDistCh.java | 8 +- .../mapred/gridmix/TestGridmixSubmission.java | 4 +- .../hadoop/streaming/TestDumpTypedBytes.java | 4 +- .../org/apache/hadoop/streaming/UtilTest.java | 4 +- .../hadoop/yarn/client/cli/TestClusterCLI.java | 2 +- .../hadoop/yarn/client/cli/TestLogsCLI.java | 4 +- .../hadoop/yarn/client/cli/TestRMAdminCLI.java | 16 ++-- .../yarn/client/cli/TestSchedConfCLI.java | 4 +- .../hadoop/yarn/client/cli/TestYarnCLI.java | 2 +- .../TestLogAggregationIndexFileController.java | 4 +- .../hadoop/registry/cli/TestRegistryCli.java | 2 +- 52 files changed, 216 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java index 5ef129c..2c689df 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/CommandExecutor.java @@ -71,8 +71,8 @@ public abstract class CommandExecutor { PrintStream origOut = System.out; PrintStream origErr = System.err; - System.setOut(new PrintStream(bao)); - System.setErr(new PrintStream(bao)); + //System.setOut(new PrintStream(bao)); + //System.setErr(new PrintStream(bao)); try { exitCode = execute(cmd); @@ -81,8 +81,8 @@ public abstract class CommandExecutor { lastException = e; exitCode = -1; } finally { - System.setOut(origOut); - System.setErr(origErr); + //System.setOut(origOut); + //System.setErr(origErr); } return new Result(bao.toString(), exitCode, lastException, cmd); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyShell.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyShell.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyShell.java index e2dcde5..55f8be8 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyShell.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyShell.java @@ -58,14 +58,14 @@ public class TestKeyShell { jceksProvider = "jceks://file" + jksPath.toUri(); initialStdOut = System.out; initialStdErr = System.err; - System.setOut(new PrintStream(outContent)); - System.setErr(new PrintStream(errContent)); + //System.setOut(new PrintStream(outContent)); + //System.setErr(new PrintStream(errContent)); } @After public void cleanUp() throws Exception { - System.setOut(initialStdOut); - System.setErr(initialStdErr); + //System.setOut(initialStdOut); + //System.setErr(initialStdErr); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java index 024a076..62a0297 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java @@ -291,7 +291,7 @@ public class TestFsShellReturnCode { final ByteArrayOutputStream bytes = new ByteArrayOutputStream(); final PrintStream out = new PrintStream(bytes); final PrintStream oldErr = System.err; - System.setErr(out); + //System.setErr(out); final String results; try { Path tdir = new Path(TEST_ROOT_DIR, "notNullCopy"); @@ -310,7 +310,7 @@ public class TestFsShellReturnCode { assertTrue(" Not displaying the intended message ",results.contains("get: `"+args[1]+"': No such file or directory")); } finally { IOUtils.closeStream(out); - System.setErr(oldErr); + //System.setErr(oldErr); } } @@ -322,7 +322,7 @@ public class TestFsShellReturnCode { final ByteArrayOutputStream bytes = new ByteArrayOutputStream(); final PrintStream err = new PrintStream(bytes); final PrintStream oldErr = System.err; - System.setErr(err); + //System.setErr(err); final String results; try { int exit = shell.run(new String[]{"-rm", "nomatch*"}); @@ -331,7 +331,7 @@ public class TestFsShellReturnCode { assertTrue(results.contains("rm: `nomatch*': No such file or directory")); } finally { IOUtils.closeStream(err); - System.setErr(oldErr); + //System.setErr(oldErr); } } @@ -343,14 +343,14 @@ public class TestFsShellReturnCode { final ByteArrayOutputStream bytes = new ByteArrayOutputStream(); final PrintStream err = new PrintStream(bytes); final PrintStream oldErr = System.err; - System.setErr(err); + //System.setErr(err); try { int exit = shell.run(new String[]{"-rm", "-f", "nomatch*"}); assertEquals(0, exit); assertTrue(bytes.toString().isEmpty()); } finally { IOUtils.closeStream(err); - System.setErr(oldErr); + //System.setErr(oldErr); } } @@ -371,7 +371,7 @@ public class TestFsShellReturnCode { final ByteArrayOutputStream bytes = new ByteArrayOutputStream(); final PrintStream out = new PrintStream(bytes); final PrintStream oldErr = System.err; - System.setErr(out); + //System.setErr(out); final String results; try { int run = shell.run(args); @@ -380,7 +380,7 @@ public class TestFsShellReturnCode { assertTrue("Return code should be 0", run == 0); } finally { IOUtils.closeStream(out); - System.setErr(oldErr); + //System.setErr(oldErr); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java index 1a6d580..5f9971c 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java @@ -435,8 +435,8 @@ public class TestTrash extends TestCase { PrintStream stderr = System.err; ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); PrintStream newOut = new PrintStream(byteStream); - System.setOut(newOut); - System.setErr(newOut); + //System.setOut(newOut); + //System.setErr(newOut); try { shell.run(args); } catch (Exception e) { @@ -444,8 +444,8 @@ public class TestTrash extends TestCase { e.getLocalizedMessage()); } String output = byteStream.toString(); - System.setOut(stdout); - System.setErr(stderr); + //System.setOut(stdout); + //System.setErr(stderr); assertTrue("skipTrash wasn't suggested as remedy to failed rm command" + " or we deleted / even though we could not get server defaults", output.indexOf("Consider using -skipTrash option") != -1 || http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java index af0a2c3..2a4b95f 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java @@ -41,14 +41,14 @@ public class TestXAttrCommands { public void setup() throws IOException { errContent.reset(); initialStdErr = System.err; - System.setErr(new PrintStream(errContent)); + //System.setErr(new PrintStream(errContent)); conf = new Configuration(); } @After public void cleanUp() throws Exception { errContent.reset(); - System.setErr(initialStdErr); + //System.setErr(initialStdErr); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestDecayRpcScheduler.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestDecayRpcScheduler.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestDecayRpcScheduler.java index 10ab40a..dba1e24 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestDecayRpcScheduler.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestDecayRpcScheduler.java @@ -259,7 +259,7 @@ public class TestDecayRpcScheduler { PrintStream output = System.out; try { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - System.setOut(new PrintStream(bytes)); + //System.setOut(new PrintStream(bytes)); // initializing DefaultMetricsSystem here would set "monitoring" flag in // MetricsSystemImpl to true @@ -270,7 +270,7 @@ public class TestDecayRpcScheduler { assertFalse(bytes.toString().contains("NullPointerException")); } finally { //set systout back - System.setOut(output); + //System.setOut(output); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/alias/TestCredShell.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/alias/TestCredShell.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/alias/TestCredShell.java index 37243dd..0159a35 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/alias/TestCredShell.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/alias/TestCredShell.java @@ -45,8 +45,8 @@ public class TestCredShell { @Before public void setup() throws Exception { - System.setOut(new PrintStream(outContent)); - System.setErr(new PrintStream(errContent)); + //System.setOut(new PrintStream(outContent)); + //System.setErr(new PrintStream(errContent)); final Path jksPath = new Path(tmpDir.toString(), "keystore.jceks"); new File(jksPath.toString()).delete(); jceksProvider = "jceks://file" + jksPath.toUri(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java index 029429b..6b8a64c 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java @@ -427,7 +427,7 @@ public abstract class GenericTestUtils { bytes = new ByteArrayOutputStream(); bytesPrintStream = new PrintStream(bytes); oldErr = System.err; - System.setErr(new TeePrintStream(oldErr, bytesPrintStream)); + //System.setErr(new TeePrintStream(oldErr, bytesPrintStream)); } public String getOutput() { @@ -437,7 +437,7 @@ public abstract class GenericTestUtils { @Override public void close() throws Exception { IOUtils.closeQuietly(bytesPrintStream); - System.setErr(oldErr); + //System.setErr(oldErr); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClasspath.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClasspath.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClasspath.java index e6a6cb1..4c445ff 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClasspath.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClasspath.java @@ -65,17 +65,17 @@ public class TestClasspath { stdout = new ByteArrayOutputStream(); printStdout = new PrintStream(stdout); - System.setOut(printStdout); + //System.setOut(printStdout); stderr = new ByteArrayOutputStream(); printStderr = new PrintStream(stderr); - System.setErr(printStderr); + //System.setErr(printStderr); } @After public void tearDown() { - System.setOut(oldStdout); - System.setErr(oldStderr); + //System.setOut(oldStdout); + //System.setErr(oldStderr); IOUtils.cleanupWithLogger(LOG, printStdout, printStderr); assertTrue(FileUtil.fullyDelete(TEST_DIR)); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestNativeLibraryChecker.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestNativeLibraryChecker.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestNativeLibraryChecker.java index 7589e5a..3a9b69e 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestNativeLibraryChecker.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestNativeLibraryChecker.java @@ -65,7 +65,7 @@ public class TestNativeLibraryChecker extends TestCase { ExitUtil.disableSystemExit(); ByteArrayOutputStream outContent = new ByteArrayOutputStream(); PrintStream originalPs = System.out; - System.setOut(new PrintStream(outContent)); + //System.setOut(new PrintStream(outContent)); try { NativeLibraryChecker.main(args); } catch (ExitException e) { @@ -77,7 +77,7 @@ public class TestNativeLibraryChecker extends TestCase { if (NativeCodeLoader.isNativeCodeLoaded()) { assertEquals(outContent.toString().indexOf("hadoop: true") != -1, true); } - System.setOut(originalPs); + //System.setOut(originalPs); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSAudit.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSAudit.java b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSAudit.java index 5955c61..16989f0 100644 --- a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSAudit.java +++ b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSAudit.java @@ -66,7 +66,7 @@ public class TestKMSAudit { memOut = new ByteArrayOutputStream(); filterOut = new FilterOut(memOut); capturedOut = new PrintStream(filterOut); - System.setErr(capturedOut); + //System.setErr(capturedOut); PropertyConfigurator.configure(Thread.currentThread(). getContextClassLoader() .getResourceAsStream("log4j-kmsaudit.properties")); @@ -76,7 +76,7 @@ public class TestKMSAudit { @After public void cleanUp() { - System.setErr(originalOut); + //System.setErr(originalOut); LogManager.resetConfiguration(); kmsAudit.shutdown(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java index 98a77f8..7102185 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java @@ -136,8 +136,8 @@ public class TestRouterAdminCLI { @After public void tearDown() { // set back system out/err - System.setOut(OLD_OUT); - System.setErr(OLD_ERR); + //System.setOut(OLD_OUT); + //System.setErr(OLD_ERR); } @Test @@ -257,7 +257,7 @@ public class TestRouterAdminCLI { assertEquals(0, ToolRunner.run(admin, argv)); // re-set system out for testing - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); stateStore.loadCache(MountTableStoreImpl.class, true); argv = new String[] {"-ls", src}; assertEquals(0, ToolRunner.run(admin, argv)); @@ -313,7 +313,7 @@ public class TestRouterAdminCLI { // remove an invalid mount table String invalidPath = "/invalid"; - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); argv = new String[] {"-rm", invalidPath}; assertEquals(0, ToolRunner.run(admin, argv)); assertTrue(out.toString().contains( @@ -370,7 +370,7 @@ public class TestRouterAdminCLI { @Test public void testMountTablePermissions() throws Exception { // re-set system out for testing - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); // use superuser to add new mount table with only read permission String[] argv = new String[] {"-add", "/testpath2-1", "ns0", "/testdir2-1", "-owner", TEST_USER, "-group", TEST_USER, "-mode", "0455"}; @@ -519,7 +519,7 @@ public class TestRouterAdminCLI { routerContext.getRouter().getRouterState()); assertTrue(routerContext.getRouter().getSafemodeService().isInSafeMode()); - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); assertEquals(0, ToolRunner.run(admin, new String[] {"-safemode", "get"})); assertTrue(out.toString().contains("true")); @@ -575,7 +575,7 @@ public class TestRouterAdminCLI { new String[] {"-nameservice", "disable", "ns0"})); stateStore.loadCache(DisabledNameserviceStoreImpl.class, true); - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); assertEquals(0, ToolRunner.run(admin, new String[] {"-getDisabledNameservices"})); assertTrue("ns0 should be reported: " + out, @@ -593,7 +593,7 @@ public class TestRouterAdminCLI { out.toString().contains("ns0")); // Wrong commands - System.setErr(new PrintStream(err)); + //System.setErr(new PrintStream(err)); assertEquals(-1, ToolRunner.run(admin, new String[] {"-nameservice", "enable"})); String msg = "Not enough parameters specificed for cmd -nameservice"; @@ -624,7 +624,7 @@ public class TestRouterAdminCLI { @Test public void testUpdateNonExistingMountTable() throws Exception { - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); String nsId = "ns0"; String src = "/test-updateNonExistingMounttable"; String dest = "/updateNonExistingMounttable"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java index e690c6d..088cf59 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java @@ -1706,16 +1706,16 @@ public class DFSTestUtil { try { ByteArrayOutputStream bs = new ByteArrayOutputStream(1024); try (PrintStream out = new PrintStream(bs)) { - System.setOut(out); - System.setErr(out); + //System.setOut(out); + //System.setErr(out); ret = tool.run(cmds); System.out.flush(); System.err.flush(); } output = bs.toString(); } finally { - System.setOut(origOut); - System.setErr(origErr); + //System.setOut(origOut); + //System.setErr(origErr); } System.out.println("Output for command: " + cmd + " retcode: " + ret); if (output != null) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBalancerBandwidth.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBalancerBandwidth.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBalancerBandwidth.java index 6bbe3a1..0190ca2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBalancerBandwidth.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBalancerBandwidth.java @@ -120,7 +120,7 @@ public class TestBalancerBandwidth { PrintStream initialStdOut = System.out; outContent.reset(); try { - System.setOut(outStream); + //System.setOut(outStream); int exitCode = admin.run(args); assertEquals("DFSAdmin should return 0", 0, exitCode); String bandwidthOutMsg = "Balancer bandwidth is " + expectedBandwidth @@ -128,7 +128,7 @@ public class TestBalancerBandwidth { String strOut = new String(outContent.toByteArray(), UTF8); assertTrue("Wrong balancer bandwidth!", strOut.contains(bandwidthOutMsg)); } finally { - System.setOut(initialStdOut); + //System.setOut(initialStdOut); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java index ce8694a..555b674 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java @@ -233,7 +233,7 @@ public class TestDFSShell { PrintStream psBackup = System.out; ByteArrayOutputStream out = new ByteArrayOutputStream(); PrintStream psOut = new PrintStream(out); - System.setOut(psOut); + //System.setOut(psOut); FsShell shell = new FsShell(dfs.getConf()); try { Path myPath = new Path("/testDu/dir"); @@ -290,7 +290,7 @@ public class TestDFSShell { Long combinedLength = myFileLength + myFile2Length; assertThat(returnString, containsString(combinedLength.toString())); } finally { - System.setOut(psBackup); + //System.setOut(psBackup); } } @@ -304,7 +304,7 @@ public class TestDFSShell { final FsShell shell = new FsShell(dfs.getConf()); try { - System.setOut(psOut); + //System.setOut(psOut); final Path parent = new Path("/testDuSnapshots"); final Path dir = new Path(parent, "dir"); mkdir(dfs, dir); @@ -407,7 +407,7 @@ public class TestDFSShell { assertTrue(returnString.contains(exludeSnapshotLength.toString())); out.reset(); } finally { - System.setOut(psBackup); + //System.setOut(psBackup); } } @@ -416,7 +416,7 @@ public class TestDFSShell { final PrintStream psBackup = System.out; final ByteArrayOutputStream out = new ByteArrayOutputStream(); final PrintStream psOut = new PrintStream(out); - System.setOut(psOut); + //System.setOut(psOut); final FsShell shell = new FsShell(dfs.getConf()); try { @@ -491,7 +491,7 @@ public class TestDFSShell { assertEquals(file2Length + newFileLength, in.nextLong()); //CONTENT_SIZE out.reset(); } finally { - System.setOut(psBackup); + //System.setOut(psBackup); } } @@ -590,7 +590,7 @@ public class TestDFSShell { bak = System.err; ByteArrayOutputStream out = new ByteArrayOutputStream(); PrintStream tmp = new PrintStream(out); - System.setErr(tmp); + //System.setErr(tmp); String[] argv = new String[2]; argv[0] = "-cat"; argv[1] = root.toUri().getPath(); @@ -719,7 +719,7 @@ public class TestDFSShell { assertTrue(returned.isEmpty()); } finally { if (bak != null) { - System.setErr(bak); + //System.setErr(bak); } } } @@ -860,7 +860,7 @@ public class TestDFSShell { pout.write(text.getBytes()); } final ByteArrayOutputStream out = new ByteArrayOutputStream(); - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); final String[] argv = new String[]{"-tail", testFile.toString()}; final int ret = ToolRunner.run(new FsShell(dfs.getConf()), argv); @@ -882,7 +882,7 @@ public class TestDFSShell { dfs.create(testFile); final ByteArrayOutputStream out = new ByteArrayOutputStream(); - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); final Thread tailer = new Thread() { @Override public void run() { @@ -950,7 +950,7 @@ public class TestDFSShell { zout.close(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); String[] argv = new String[2]; argv[0] = "-text"; @@ -970,7 +970,7 @@ public class TestDFSShell { writer.append(new Text("Foo"), new Text("Bar")); writer.close(); out = new ByteArrayOutputStream(); - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); argv = new String[2]; argv[0] = "-text"; argv[1] = new Path(root, "file.gz").toString(); @@ -987,7 +987,7 @@ public class TestDFSShell { dout.write(outbytes); dout.close(); out = new ByteArrayOutputStream(); - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); argv = new String[2]; argv[0] = "-text"; argv[1] = new Path(root, "file.deflate").toString(); @@ -1008,7 +1008,7 @@ public class TestDFSShell { fout.write(writebytes); fout.close(); out = new ByteArrayOutputStream(); - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); argv = new String[2]; argv[0] = "-text"; argv[1] = new Path(root, p).toString(); @@ -1019,7 +1019,7 @@ public class TestDFSShell { out.reset(); } finally { if (null != bak) { - System.setOut(bak); + //System.setOut(bak); } } } @@ -1152,7 +1152,7 @@ public class TestDFSShell { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bytes); PrintStream oldOut = System.out; - System.setOut(out); + //System.setOut(out); Scanner in = null; String results = null; try { @@ -1162,7 +1162,7 @@ public class TestDFSShell { assertEquals(dirs, in.nextLong()); assertEquals(files, in.nextLong()); } finally { - System.setOut(oldOut); + //System.setOut(oldOut); if (in!=null) in.close(); IOUtils.closeStream(out); System.out.println("results:\n" + results); @@ -1812,7 +1812,7 @@ public class TestDFSShell { FsShell fshell = new FsShell(dfs.getConf()); ByteArrayOutputStream out = new ByteArrayOutputStream(); PrintStream tmp = new PrintStream(out); - System.setErr(tmp); + //System.setErr(tmp); String[] args = new String[2]; args[0] = "-ls"; args[1] = "/foo"; @@ -1827,7 +1827,7 @@ public class TestDFSShell { }); } finally { if (bak != null) { - System.setErr(bak); + //System.setErr(bak); } } } @@ -1945,7 +1945,7 @@ public class TestDFSShell { final String atime2 = fmt.format(new Date(status2.getAccessTime())); final ByteArrayOutputStream out = new ByteArrayOutputStream(); - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); doFsStat(dfs.getConf(), null); @@ -2043,15 +2043,15 @@ public class TestDFSShell { final PrintStream out = new PrintStream(bytes); final PrintStream oldOut = System.out; final PrintStream oldErr = System.err; - System.setOut(out); - System.setErr(out); + //System.setOut(out); + //System.setErr(out); final String results; try { assertEquals(returnvalue, shell.run(new String[]{"-lsr", root})); results = bytes.toString(); } finally { - System.setOut(oldOut); - System.setErr(oldErr); + //System.setOut(oldOut); + //System.setErr(oldErr); IOUtils.closeStream(out); } System.out.println("results:\n" + results); @@ -2662,8 +2662,8 @@ public class TestDFSShell { final ByteArrayOutputStream bao = new ByteArrayOutputStream(); final PrintStream capture = new PrintStream(bao); - System.setOut(capture); - System.setErr(capture); + //System.setOut(capture); + //System.setErr(capture); final String[] argv = new String[] { "-setrep", "1", hdfsFile.toString() }; @@ -2671,8 +2671,8 @@ public class TestDFSShell { assertEquals("Command did not return the expected exit code", 1, shell.run(argv)); } finally { - System.setOut(origOut); - System.setErr(origErr); + //System.setOut(origOut); + //System.setErr(origErr); } assertTrue("Error message is not the expected error message" @@ -2865,7 +2865,7 @@ public class TestDFSShell { bak = System.err; final FsShell fshell = new FsShell(dfs.getConf()); final ByteArrayOutputStream out = new ByteArrayOutputStream(); - System.setErr(new PrintStream(out)); + //System.setErr(new PrintStream(out)); // No permission to write xattr dfs.setPermission(p, new FsPermission((short) 0700)); @@ -2914,7 +2914,7 @@ public class TestDFSShell { }); } finally { if (bak != null) { - System.setErr(bak); + //System.setErr(bak); } } } @@ -2930,7 +2930,7 @@ public class TestDFSShell { final FsShell fshell = new FsShell(dfs.getConf()); final ByteArrayOutputStream out = new ByteArrayOutputStream(); - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); doSetXattr(out, fshell, new String[] {"-setfattr", "-n", "User.Foo", p.toString()}, @@ -2977,7 +2977,7 @@ public class TestDFSShell { } finally { if (bak != null) { - System.setOut(bak); + //System.setOut(bak); } } } @@ -3054,7 +3054,7 @@ public class TestDFSShell { final FsShell fshell = new FsShell(dfs.getConf()); final ByteArrayOutputStream out = new ByteArrayOutputStream(); - System.setErr(new PrintStream(out)); + //System.setErr(new PrintStream(out)); //Test 1. Let user1 be owner for /foo user1.doAs(new PrivilegedExceptionAction<Object>() { @@ -3196,7 +3196,7 @@ public class TestDFSShell { }); } finally { if (bak != null) { - System.setErr(bak); + //System.setErr(bak); } } } @@ -3219,7 +3219,7 @@ public class TestDFSShell { final FsShell fshell = new FsShell(dfs.getConf()); final ByteArrayOutputStream out = new ByteArrayOutputStream(); - System.setErr(new PrintStream(out)); + //System.setErr(new PrintStream(out)); // No permission for "other". dfs.setPermission(p, new FsPermission((short) 0700)); @@ -3256,7 +3256,7 @@ public class TestDFSShell { } } finally { if (bakErr != null) { - System.setErr(bakErr); + //System.setErr(bakErr); } } } @@ -3325,7 +3325,7 @@ public class TestDFSShell { PrintStream syserr = System.err; final ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(baos); - System.setErr(ps); + //System.setErr(ps); try { runCmd(shell, "-ls", "/.reserved"); assertEquals(0, baos.toString().length()); @@ -3333,7 +3333,7 @@ public class TestDFSShell { runCmd(shell, "-ls", "/.reserved/raw/.reserved"); assertTrue(baos.toString().contains("No such file or directory")); } finally { - System.setErr(syserr); + //System.setErr(syserr); cluster.shutdown(); } } @@ -3386,13 +3386,13 @@ public class TestDFSShell { PrintStream syserr = System.err; final ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(baos); - System.setErr(ps); + //System.setErr(ps); try { FsShell shell = new FsShell(dfs.getConf()); runCmd(shell, "-cp", src.toString(), "/.reserved"); assertTrue(baos.toString().contains("Invalid path name /.reserved")); } finally { - System.setErr(syserr); + //System.setErr(syserr); } } @@ -3402,13 +3402,13 @@ public class TestDFSShell { PrintStream syserr = System.err; final ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(baos); - System.setErr(ps); + //System.setErr(ps); try { FsShell shell = new FsShell(dfs.getConf()); runCmd(shell, "-chmod", "777", "/.reserved"); assertTrue(baos.toString().contains("Invalid path name /.reserved")); } finally { - System.setErr(syserr); + //System.setErr(syserr); } } @@ -3418,13 +3418,13 @@ public class TestDFSShell { PrintStream syserr = System.err; final ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(baos); - System.setErr(ps); + //System.setErr(ps); try { FsShell shell = new FsShell(dfs.getConf()); runCmd(shell, "-chown", "user1", "/.reserved"); assertTrue(baos.toString().contains("Invalid path name /.reserved")); } finally { - System.setErr(syserr); + //System.setErr(syserr); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFsShellPermission.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFsShellPermission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFsShellPermission.java index cc456b2..b54b15e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFsShellPermission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFsShellPermission.java @@ -99,11 +99,11 @@ public class TestFsShellPermission { PrintStream old = System.out; int ret; try { - System.setOut(out); + //System.setOut(out); ret = shell.run(args); out.close(); } finally { - System.setOut(old); + //System.setOut(old); } return String.valueOf(ret); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java index e0dfb4a..0c5ef0d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMaintenanceState.java @@ -1139,8 +1139,8 @@ public class TestMaintenanceState extends AdminStatesBaseTest { public void testReportMaintenanceNodes() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream err = new ByteArrayOutputStream(); - System.setOut(new PrintStream(out)); - System.setErr(new PrintStream(err)); + //System.setOut(new PrintStream(out)); + //System.setErr(new PrintStream(err)); LOG.info("Starting testReportMaintenanceNodes"); int expirationInMs = 30 * 1000; http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java index bf044e6..b13c6de 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java @@ -122,8 +122,8 @@ public class TestQuota { } private static void redirectStream() { - System.setOut(new PrintStream(OUT_STREAM)); - System.setErr(new PrintStream(ERR_STREAM)); + //System.setOut(new PrintStream(OUT_STREAM)); + //System.setErr(new PrintStream(ERR_STREAM)); } private static void resetStream() { @@ -137,8 +137,8 @@ public class TestQuota { System.out.flush(); System.err.flush(); } finally { - System.setOut(OLD_OUT); - System.setErr(OLD_ERR); + //System.setOut(OLD_OUT); + //System.setErr(OLD_ERR); } if (cluster != null) { @@ -1148,7 +1148,7 @@ public class TestQuota { ByteArrayOutputStream err = new ByteArrayOutputStream(); PrintStream oldErr = System.err; try { - System.setErr(new PrintStream(err)); + //System.setErr(new PrintStream(err)); String[] args = { "-setSpaceQuota", "100", "-storageType", "COLD", "/testDir" }; admin.run(args); @@ -1156,7 +1156,7 @@ public class TestQuota { assertTrue( errOutput.contains(StorageType.getTypesSupportingQuota().toString())); } finally { - System.setErr(oldErr); + //System.setErr(oldErr); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java index d5a3948..549487e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java @@ -235,14 +235,14 @@ public class TestClusterId { PrintStream origErr = System.err; ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream stdErr = new PrintStream(baos); - System.setErr(stdErr); + //System.setErr(stdErr); try { NameNode.createNameNode(argv, config); // Check if usage is printed assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode")); } finally { - System.setErr(origErr); + //System.setErr(origErr); } // check if the version file does not exists. @@ -263,14 +263,14 @@ public class TestClusterId { PrintStream origErr = System.err; ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream stdErr = new PrintStream(baos); - System.setErr(stdErr); + //System.setErr(stdErr); try { NameNode.createNameNode(argv, config); // Check if usage is printed assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode")); } finally { - System.setErr(origErr); + //System.setErr(origErr); } // check if the version file does not exists. @@ -292,14 +292,14 @@ public class TestClusterId { PrintStream origErr = System.err; ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream stdErr = new PrintStream(baos); - System.setErr(stdErr); + //System.setErr(stdErr); try { NameNode.createNameNode(argv, config); // Check if usage is printed assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode")); } finally { - System.setErr(origErr); + //System.setErr(origErr); } // check if the version file does not exists. http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java index cbb7970..7585945 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java @@ -181,7 +181,7 @@ public class TestDecommissioningStatus { ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(baos); PrintStream oldOut = System.out; - System.setOut(ps); + //System.setOut(ps); try { // Parse DFSAdmin just to check the count admin.report(new String[] {"-decommissioning"}, 0); @@ -216,7 +216,7 @@ public class TestDecommissioningStatus { decomming.contains(id)); } } finally { - System.setOut(oldOut); + //System.setOut(oldOut); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java index e1663e2..e7c71f4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetadataVersionOutput.java @@ -76,7 +76,7 @@ public class TestMetadataVersionOutput { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); final PrintStream stdOut = new PrintStream(baos); try { - System.setOut(stdOut); + //System.setOut(stdOut); try { NameNode.createNameNode(new String[] { "-metadataVersion" }, conf); } catch (Exception e) { @@ -89,7 +89,7 @@ public class TestMetadataVersionOutput { assertTrue(baos.toString("UTF-8"). contains("Software format version: " + verNumStr)); } finally { - System.setOut(origOut); + //System.setOut(origOut); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java index 8bd7967..719cd89 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java @@ -1052,8 +1052,8 @@ public class TestSnapshotDeletion { PrintStream oldOut = System.out; PrintStream oldErr = System.err; try { - System.setOut(psOut); - System.setErr(psOut); + //System.setOut(psOut); + //System.setErr(psOut); FsShell shell = new FsShell(); shell.setConf(conf); @@ -1072,8 +1072,8 @@ public class TestSnapshotDeletion { psOut.close(); out.close(); } finally { - System.setOut(oldOut); - System.setErr(oldErr); + //System.setOut(oldOut); + //System.setErr(oldErr); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotFileLength.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotFileLength.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotFileLength.java index 90e499d..3dc8df4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotFileLength.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotFileLength.java @@ -212,8 +212,8 @@ public class TestSnapshotFileLength { PrintStream outBackup = System.out; PrintStream errBackup = System.err; ByteArrayOutputStream bao = new ByteArrayOutputStream(); - System.setOut(new PrintStream(bao)); - System.setErr(new PrintStream(bao)); + //System.setOut(new PrintStream(bao)); + //System.setErr(new PrintStream(bao)); // Make sure we can cat the file upto to snapshot length FsShell shell = new FsShell(); try { @@ -221,8 +221,8 @@ public class TestSnapshotFileLength { "/TestSnapshotFileLength/sub1/.snapshot/snapshot1/file1" }); assertEquals("Unexpected # bytes from -cat", BLOCKSIZE, bao.size()); } finally { - System.setOut(outBackup); - System.setErr(errBackup); + //System.setOut(outBackup); + //System.setErr(errBackup); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotRename.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotRename.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotRename.java index 2905fcf..a2ef169 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotRename.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotRename.java @@ -257,8 +257,8 @@ public class TestSnapshotRename { PrintStream oldOut = System.out; PrintStream oldErr = System.err; try { - System.setOut(psOut); - System.setErr(psOut); + //System.setOut(psOut); + //System.setErr(psOut); FsShell shell = new FsShell(); shell.setConf(conf); @@ -277,8 +277,8 @@ public class TestSnapshotRename { psOut.close(); out.close(); } finally { - System.setOut(oldOut); - System.setErr(oldErr); + //System.setOut(oldOut); + //System.setErr(oldErr); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java index 58ad52c..d9ed683 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java @@ -105,8 +105,8 @@ public class TestDFSAdmin { } private void redirectStream() { - System.setOut(new PrintStream(out)); - System.setErr(new PrintStream(err)); + //System.setOut(new PrintStream(out)); + //System.setErr(new PrintStream(err)); } private void resetStream() { @@ -120,8 +120,8 @@ public class TestDFSAdmin { System.out.flush(); System.err.flush(); } finally { - System.setOut(OLD_OUT); - System.setErr(OLD_ERR); + //System.setOut(OLD_OUT); + //System.setErr(OLD_ERR); } if (cluster != null) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java index 0874f0e..40260dc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java @@ -93,8 +93,8 @@ public class TestDFSAdminWithHA { admin.setConf(conf); assertTrue(HAUtil.isHAEnabled(conf, "ns1")); - System.setOut(new PrintStream(out)); - System.setErr(new PrintStream(err)); + //System.setOut(new PrintStream(out)); + //System.setErr(new PrintStream(err)); // Reduce the number of retries to speed up the tests. conf.setInt( @@ -114,8 +114,8 @@ public class TestDFSAdminWithHA { System.out.flush(); System.err.flush(); } finally { - System.setOut(oldOut); - System.setErr(oldErr); + //System.setOut(oldOut); + //System.setErr(oldErr); } if (admin != null) { admin.close(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDebugAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDebugAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDebugAdmin.java index 5c890a5..eb51580 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDebugAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDebugAdmin.java @@ -76,14 +76,14 @@ public class TestDebugAdmin { final PrintStream out = new PrintStream(bytes); final PrintStream oldErr = System.err; final PrintStream oldOut = System.out; - System.setErr(out); - System.setOut(out); + //System.setErr(out); + //System.setOut(out); int ret; try { ret = admin.run(cmd); } finally { - System.setErr(oldErr); - System.setOut(oldOut); + //System.setErr(oldErr); + //System.setOut(oldOut); IOUtils.closeStream(out); } return "ret: " + ret + ", " + http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java index bbe1c2e..c064733 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java @@ -296,7 +296,7 @@ public class TestOfflineEditsViewer { final PrintStream out = new PrintStream(bytes); final PrintStream oldOut = System.out; try { - System.setOut(out); + //System.setOut(out); int status = new OfflineEditsViewer().run(new String[] { "-h" }); assertTrue("" + "Exit code returned for help option is incorrect", status == 0); @@ -304,7 +304,7 @@ public class TestOfflineEditsViewer { "Invalid Command error displayed when help option is passed.", bytes .toString().contains("Error parsing command-line options")); } finally { - System.setOut(oldOut); + //System.setOut(oldOut); IOUtils.closeStream(out); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java index d0a7567..6e4f989 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java @@ -428,7 +428,7 @@ public class TestOfflineImageViewer { final PrintStream out = new PrintStream(bytes); final PrintStream oldOut = System.out; try { - System.setOut(out); + //System.setOut(out); int status = OfflineImageViewerPB.run(new String[] { "-h" }); assertTrue("Exit code returned for help option is incorrect", status == 0); Assert.assertFalse( @@ -442,7 +442,7 @@ public class TestOfflineImageViewer { "Exit code returned for help with other option is incorrect", status == -1); } finally { - System.setOut(oldOut); + //System.setOut(oldOut); IOUtils.closeStream(out); } } @@ -637,7 +637,7 @@ public class TestOfflineImageViewer { final PrintStream out = new PrintStream(bytes); final PrintStream oldOut = System.out; try { - System.setOut(out); + //System.setOut(out); // Add the -h option to make the test only for option parsing, // and don't need to do the following operations. OfflineImageViewer.main(new String[] {"-i", "-", "-o", "-", "-p", @@ -645,7 +645,7 @@ public class TestOfflineImageViewer { Assert.assertFalse(bytes.toString().contains( "Error parsing command-line options: ")); } finally { - System.setOut(oldOut); + //System.setOut(oldOut); IOUtils.closeStream(out); } } @@ -656,7 +656,7 @@ public class TestOfflineImageViewer { final PrintStream out = new PrintStream(bytes); final PrintStream oldOut = System.out; try { - System.setOut(out); + //System.setOut(out); int status = OfflineImageViewerPB.run(new String[] {"-i", originalFsimage.getAbsolutePath(), "-o", "-", "-p", @@ -665,7 +665,7 @@ public class TestOfflineImageViewer { assertEquals(0, status); Assert.assertTrue(bytes.toString().contains("(0 B, 8 B]")); } finally { - System.setOut(oldOut); + //System.setOut(oldOut); IOUtils.closeStream(out); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java index a61420c..9c123be 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java @@ -143,7 +143,7 @@ public class TestJMXGet { PipedOutputStream pipeOut = new PipedOutputStream(); PipedInputStream pipeIn = new PipedInputStream(pipeOut, 1024 * 1024); PrintStream oldErr = System.err; - System.setErr(new PrintStream(pipeOut)); + //System.setErr(new PrintStream(pipeOut)); try { jmx.printAllValues(); if ((size = pipeIn.available()) != 0) { @@ -153,7 +153,7 @@ public class TestJMXGet { pipeOut.close(); pipeIn.close(); } finally { - System.setErr(oldErr); + //System.setErr(oldErr); } return bytes != null ? new String(bytes).contains(pattern) : false; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestTools.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestTools.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestTools.java index e2f1011..ef6e6c5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestTools.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestTools.java @@ -110,9 +110,9 @@ public class TestTools { PipedOutputStream pipeOut = new PipedOutputStream(); PipedInputStream pipeIn = new PipedInputStream(pipeOut, PIPE_BUFFER_SIZE); if (out == System.out) { - System.setOut(new PrintStream(pipeOut)); + //System.setOut(new PrintStream(pipeOut)); } else if (out == System.err) { - System.setErr(new PrintStream(pipeOut)); + //System.setErr(new PrintStream(pipeOut)); } if (clazz == DelegationTokenFetcher.class) { @@ -129,8 +129,8 @@ public class TestTools { } catch (Exception ex) { fail("checkOutput error " + ex); } finally { - System.setOut(oldOut); - System.setErr(oldErr); + //System.setOut(oldOut); + //System.setErr(oldErr); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java index ee9494b..fdd49ee 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java @@ -51,8 +51,8 @@ public class TestTraceAdmin extends SaslDataTransferTestCase { PrintStream ps = new PrintStream(baos); PrintStream oldStdout = System.out; PrintStream oldStderr = System.err; - System.setOut(ps); - System.setErr(ps); + //System.setOut(ps); + //System.setErr(ps); int ret = -1; try { ret = trace.run(cmd); @@ -60,8 +60,8 @@ public class TestTraceAdmin extends SaslDataTransferTestCase { try { System.out.flush(); } finally { - System.setOut(oldStdout); - System.setErr(oldStderr); + //System.setOut(oldStdout); + //System.setErr(oldStderr); } } return "ret:" + ret + ", " + baos.toString(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java index cb5301f..2d6bc14 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java @@ -350,7 +350,7 @@ public class TestJobHistoryParsing { // test output for HistoryViewer PrintStream stdps = System.out; try { - System.setOut(new PrintStream(outContent)); + //System.setOut(new PrintStream(outContent)); HistoryViewer viewer; synchronized (fileInfo) { viewer = new HistoryViewer(fc.makeQualified( @@ -370,7 +370,7 @@ public class TestJobHistoryParsing { taskInfo.getTaskId().toString()) > 0); } } finally { - System.setOut(stdps); + //System.setOut(stdps); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java index 45c7d1f..84d0021 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java @@ -325,13 +325,13 @@ public class TestNetworkedJob { JobQueueClient jobClient = new JobQueueClient(job); ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - System.setOut(new PrintStream(bytes)); + //System.setOut(new PrintStream(bytes)); String[] arg = { "-list" }; jobClient.run(arg); assertTrue(bytes.toString().contains("Queue Name : default")); assertTrue(bytes.toString().contains("Queue State : running")); bytes = new ByteArrayOutputStream(); - System.setOut(new PrintStream(bytes)); + //System.setOut(new PrintStream(bytes)); String[] arg1 = { "-showacls" }; jobClient.run(arg1); assertTrue(bytes.toString().contains("Queue acls for user :")); @@ -343,7 +343,7 @@ public class TestNetworkedJob { // test for info and default queue bytes = new ByteArrayOutputStream(); - System.setOut(new PrintStream(bytes)); + //System.setOut(new PrintStream(bytes)); String[] arg2 = { "-info", "default" }; jobClient.run(arg2); assertTrue(bytes.toString().contains("Queue Name : default")); @@ -352,7 +352,7 @@ public class TestNetworkedJob { // test for info , default queue and jobs bytes = new ByteArrayOutputStream(); - System.setOut(new PrintStream(bytes)); + //System.setOut(new PrintStream(bytes)); String[] arg3 = { "-info", "default", "-showJobs" }; jobClient.run(arg3); assertTrue(bytes.toString().contains("Queue Name : default")); @@ -365,7 +365,7 @@ public class TestNetworkedJob { } finally { - System.setOut(oldOut); + //System.setOut(oldOut); if (fileSys != null) { fileSys.delete(testDir, true); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java index 9b88c5c..d103af0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java @@ -272,7 +272,7 @@ public class TestPipeApplication { ExitUtil.disableSystemExit(); // test without parameters try { - System.setOut(new PrintStream(out)); + //System.setOut(new PrintStream(out)); Submitter.main(new String[0]); fail(); } catch (ExitUtil.ExitException e) { @@ -321,7 +321,7 @@ public class TestPipeApplication { "-archives <archive1,...> specify a comma-separated list of " + "archives to be unarchived on the compute machines")); } finally { - System.setOut(oldps); + //System.setOut(oldps); // restore System.setSecurityManager(securityManager); if (psw != null) { @@ -372,7 +372,7 @@ public class TestPipeApplication { assertEquals(e.status, 0); } finally { - System.setOut(oldps); + //System.setOut(oldps); System.setSecurityManager(securityManager); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java index 747cd9f..a9e6314 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java @@ -95,10 +95,10 @@ public class TestMRJobClient extends ClusterMapReduceTestCase { PrintStream oldOut = System.out; PrintStream newOut = new PrintStream(out, true); try { - System.setOut(newOut); + //System.setOut(newOut); return ToolRunner.run(conf, tool, args); } finally { - System.setOut(oldOut); + //System.setOut(oldOut); } } @@ -265,7 +265,7 @@ public class TestMRJobClient extends ClusterMapReduceTestCase { private void startStop() { ByteArrayOutputStream data = new ByteArrayOutputStream(); PrintStream error = System.err; - System.setErr(new PrintStream(data)); + //System.setErr(new PrintStream(data)); ExitUtil.disableSystemExit(); try { CLI.main(new String[0]); @@ -277,7 +277,7 @@ public class TestMRJobClient extends ClusterMapReduceTestCase { } catch (Exception e) { } finally { - System.setErr(error); + //System.setErr(error); } // in console should be written help text String s = new String(data.toByteArray()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java index 36119f5..1856d5c 100644 --- a/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java +++ b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java @@ -148,8 +148,8 @@ public class DfsTask extends Task { antOut = System.out; antErr = System.err; try { - System.setOut(new PrintStream(out, false, "UTF-8")); - System.setErr(out == err ? + //System.setOut(new PrintStream(out, false, "UTF-8")); + //System.setErr(out == err ? System.out : new PrintStream(err, false, "UTF-8")); } catch (UnsupportedEncodingException ignored) { } @@ -167,8 +167,8 @@ public class DfsTask extends Task { if (out != err && errprop != null && !System.err.checkError()) getProject().setNewProperty(errprop, err.toString()); - System.setErr(antErr); - System.setOut(antOut); + //System.setErr(antErr); + //System.setOut(antOut); confloader.cleanup(); confloader.setParent(null); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java b/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java index c63bc42..02bb5c5 100644 --- a/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java +++ b/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java @@ -186,7 +186,7 @@ public class TestHadoopArchives { PrintStream stderr = System.err; ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); PrintStream newErr = new PrintStream(byteStream); - System.setErr(newErr); + //System.setErr(newErr); // fail if the archive path already exists createFile(archivePath, fs, harName); @@ -210,7 +210,7 @@ public class TestHadoopArchives { Assert.assertTrue(output.indexOf("Destination " + archivePath2.toString() + " should be a directory but is a file") != -1); - System.setErr(stderr); + //System.setErr(stderr); } @Test @@ -296,16 +296,16 @@ public class TestHadoopArchives { final PrintStream out = new PrintStream(bytes); final PrintStream oldOut = System.out; final PrintStream oldErr = System.err; - System.setOut(out); - System.setErr(out); + //System.setOut(out); + //System.setErr(out); final String results; try { Assert.assertEquals(0, shell.run(new String[] { "-lsr", dir })); results = bytes.toString(); } finally { IOUtils.closeStream(out); - System.setOut(oldOut); - System.setErr(oldErr); + //System.setOut(oldOut); + //System.setErr(oldErr); } System.out.println("lsr results:\n" + results); String dirname = rootDir; http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSyncReverseBase.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSyncReverseBase.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSyncReverseBase.java index fea374e..d853c0b 100644 --- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSyncReverseBase.java +++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSyncReverseBase.java @@ -86,16 +86,16 @@ public abstract class TestDistCpSyncReverseBase { final PrintStream out = new PrintStream(bytes); final PrintStream oldOut = System.out; final PrintStream oldErr = System.err; - System.setOut(out); - System.setErr(out); + //System.setOut(out); + //System.setErr(out); final String results; try { Assert.assertEquals(0, shell.run(new String[] {"-lsr", dir })); results = bytes.toString(); } finally { IOUtils.closeStream(out); - System.setOut(oldOut); - System.setErr(oldErr); + //System.setOut(oldOut); + //System.setErr(oldErr); } System.out.println("lsr results:\n" + results); String dirname = rootDir; http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSystem.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSystem.java index b2266b3..5d7faf5 100644 --- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSystem.java +++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSystem.java @@ -107,10 +107,10 @@ public class TestDistCpSystem { ByteArrayOutputStream baout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(baout, true); PrintStream old = System.out; - System.setOut(out); + //System.setOut(out); shell.run(args); out.close(); - System.setOut(old); + //System.setOut(old); return baout.toString(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java index b28da4c..a89bc6f 100644 --- a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java +++ b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java @@ -1115,10 +1115,10 @@ public class TestCopyFiles extends TestCase { ByteArrayOutputStream baout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(baout, true); PrintStream old = System.out; - System.setOut(out); + //System.setOut(out); shell.run(args); out.close(); - System.setOut(old); + //System.setOut(old); return baout.toString(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java index 3704c5b..b4eb893 100644 --- a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java +++ b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java @@ -206,16 +206,16 @@ public class TestDistCh extends junit.framework.TestCase { final PrintStream out = new PrintStream(bytes); final PrintStream oldOut = System.out; final PrintStream oldErr = System.err; - System.setOut(out); - System.setErr(out); + //System.setOut(out); + //System.setErr(out); final String results; try { assertEquals(returnvalue, shell.run(new String[]{"-lsr", root})); results = bytes.toString(); } finally { IOUtils.closeStream(out); - System.setOut(oldOut); - System.setErr(oldErr); + //System.setOut(oldOut); + //System.setErr(oldErr); } System.out.println("results:\n" + results); return results; http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java index f849843..f3c86c4 100644 --- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java +++ b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java @@ -179,7 +179,7 @@ public class TestGridmixSubmission extends CommonJobTest { final ByteArrayOutputStream bytes = new ByteArrayOutputStream(); final PrintStream out = new PrintStream(bytes); final PrintStream oldOut = System.out; - System.setErr(out); + //System.setErr(out); ExitUtil.disableSystemExit(); try { String[] argv = new String[0]; @@ -189,7 +189,7 @@ public class TestGridmixSubmission extends CommonJobTest { assertExceptionContains(ExitUtil.EXIT_EXCEPTION_MESSAGE, e); ExitUtil.resetFirstExitException(); } finally { - System.setErr(oldOut); + //System.setErr(oldOut); System.setSecurityManager(securityManager); } String print = bytes.toString(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestDumpTypedBytes.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestDumpTypedBytes.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestDumpTypedBytes.java index bbfc020..479a7b3 100644 --- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestDumpTypedBytes.java +++ b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestDumpTypedBytes.java @@ -45,7 +45,7 @@ public class TestDumpTypedBytes { PrintStream psBackup = System.out; ByteArrayOutputStream out = new ByteArrayOutputStream(); PrintStream psOut = new PrintStream(out); - System.setOut(psOut); + //System.setOut(psOut); DumpTypedBytes dumptb = new DumpTypedBytes(conf); try { @@ -86,7 +86,7 @@ public class TestDumpTypedBytes { fs.close(); } catch (Exception e) { } - System.setOut(psBackup); + //System.setOut(psBackup); cluster.shutdown(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UtilTest.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UtilTest.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UtilTest.java index 31e4905..640602f 100644 --- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UtilTest.java +++ b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UtilTest.java @@ -80,8 +80,8 @@ class UtilTest { new File(antTestDir_).mkdirs(); File outFile = new File(antTestDir_, testName_+".log"); PrintStream out = new PrintStream(new FileOutputStream(outFile)); - System.setOut(out); - System.setErr(out); + //System.setOut(out); + //System.setErr(out); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestClusterCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestClusterCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestClusterCLI.java index 5a0f049..6b959e1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestClusterCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestClusterCLI.java @@ -50,7 +50,7 @@ public class TestClusterCLI { sysOut = spy(new PrintStream(sysOutStream)); sysErrStream = new ByteArrayOutputStream(); sysErr = spy(new PrintStream(sysErrStream)); - System.setOut(sysOut); + //System.setOut(sysOut); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b580aaa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java index 7aa92f3..f539e83 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java @@ -99,11 +99,11 @@ public class TestLogsCLI { public void setUp() { sysOutStream = new ByteArrayOutputStream(); sysOut = new PrintStream(sysOutStream); - System.setOut(sysOut); + //System.setOut(sysOut); sysErrStream = new ByteArrayOutputStream(); sysErr = new PrintStream(sysErrStream); - System.setErr(sysErr); + //System.setErr(sysErr); } @Test(timeout = 5000l) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
