tez git commit: TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter. Contributed by Ming Ma. (cherry picked from commit 89802b1c599e34027eedda5d826035cd66b99f85)

[sseth]

Repository: tez
Updated Branches:
  refs/heads/branch-0.8 a1960d39d -> 6030c2721


TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter. Contributed by Ming 
Ma.
(cherry picked from commit 89802b1c599e34027eedda5d826035cd66b99f85)

Conflicts:
        CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/6030c272
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/6030c272
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/6030c272

Branch: refs/heads/branch-0.8
Commit: 6030c2721fcb63a2d5e6cd692f4114777f003416
Parents: a1960d3
Author: Siddharth Seth <ss...@apache.org>
Authored: Thu May 26 11:01:35 2016 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Thu May 26 11:03:10 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                             |  2 ++
 .../writers/TestUnorderedPartitionedKVWriter.java       | 12 ------------
 2 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/6030c272/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c0efb21..8350baa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter.
   TEZ-3240. Improvements to tez.lib.uris to allow for multiple tarballs and 
mixing tarballs and jars.
   TEZ-3237. Corrupted shuffle transfers to disk are not detected during 
transfer
   TEZ-3246. Improve diagnostics when DAG killed by user
@@ -453,6 +454,7 @@ Release 0.7.2: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-3257. Fix flaky test TestUnorderedPartitionedKVWriter.
   TEZ-3237. Corrupted shuffle transfers to disk are not detected during 
transfer
   TEZ-3258. Jvm Checker does not ignore DisableExplicitGC when checking JVM GC 
options.
   TEZ-3256. [Backport HADOOP-11032] Remove Guava Stopwatch dependency

http://git-wip-us.apache.org/repos/asf/tez/blob/6030c272/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java
----------------------------------------------------------------------
diff --git 
a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java
 
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java
index 8c935eb..566559f 100644
--- 
a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java
+++ 
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java
@@ -496,12 +496,6 @@ public class TestUnorderedPartitionedKVWriter {
 
     verify(outputContext, never()).reportFailure(any(TaskFailureType.class), 
any(Throwable.class), any(String.class));
 
-    // Verify the status of the buffers
-    if (numExpectedSpills == 0) {
-      assertEquals(1, kvWriter.numInitializedBuffers);
-    } else {
-      assertTrue(kvWriter.numInitializedBuffers > 1);
-    }
     assertNull(kvWriter.currentBuffer);
     assertEquals(0, kvWriter.availableBuffers.size());
 
@@ -654,12 +648,6 @@ public class TestUnorderedPartitionedKVWriter {
 
     verify(outputContext, never()).reportFailure(any(TaskFailureType.class), 
any(Throwable.class), any(String.class));
 
-    // Verify the status of the buffers
-    if (numExpectedSpills == 0) {
-      assertEquals(1, kvWriter.numInitializedBuffers);
-    } else {
-      assertTrue(kvWriter.numInitializedBuffers > 1);
-    }
     assertNull(kvWriter.currentBuffer);
     assertEquals(0, kvWriter.availableBuffers.size());