MAPREDUCE-1375. Fixes flaky test TestFileArgs. Contributed by Todd Lipcon

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@991846 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 1d87133..9e1d499 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -268,6 +268,9 @@
     MAPREDUCE-2021. Fixes duplicate hostnames in CombineFileInputFormat's
     split locations. (amareshwari)
 
+    MAPREDUCE-1375. Fixes flaky test TestFileArgs. (Todd Lipcon via
+    amareshwari)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java
index 32ff013..b9c720d 100644
--- a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java
+++ b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java
@@ -72,6 +72,10 @@
     DataOutputStream dos = localFs.create(new Path("sidefile"));
     dos.write("hello world\n".getBytes("UTF-8"));
     dos.close();
+
+    // Since ls doesn't read stdin, we don't want to write anything
+    // to it, or else we risk Broken Pipe exceptions.
+    input = "";
   }
 
   @After