PIG-5430: TestTezGraceParallelism failing due to tez log change (knoguchi)
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1904623 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index aee6139..42d657e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -116,6 +116,8 @@
BUG FIXES
+PIG-5430: TestTezGraceParallelism failing due to tez log change (knoguchi)
+
PIG-5406: TestJoinLocal imports org.python.google.common.collect.Lists instead of org.google.common.collect.Lists (rohini)
PIG-5425: Pig 0.15 and later don't set context signature correctly (jtolar via rohini)
diff --git a/test/org/apache/pig/tez/TestTezGraceParallelism.java b/test/org/apache/pig/tez/TestTezGraceParallelism.java
index b99c7af..2ed5349 100644
--- a/test/org/apache/pig/tez/TestTezGraceParallelism.java
+++ b/test/org/apache/pig/tez/TestTezGraceParallelism.java
@@ -141,9 +141,9 @@
Util.checkQueryOutputsAfterSort(iter, expectedResults);
assertTrue(writer.toString().contains("Initialize parallelism for scope-52 to 18"));
assertTrue(writer.toString().contains("Initialize parallelism for scope-56 to 7"));
- assertTrue(writer.toString().contains("Reduce auto parallelism for vertex: scope-49 to 1 from 2"));
- assertTrue(writer.toString().contains("Reduce auto parallelism for vertex: scope-52 to 1 from 18"));
- assertTrue(writer.toString().contains("Reduce auto parallelism for vertex: scope-56 to 1 from 7"));
+ assertTrue(writer.toString().contains("Reducing auto parallelism for vertex: scope-49 from 2 to 1"));
+ assertTrue(writer.toString().contains("Reducing auto parallelism for vertex: scope-52 from 18 to 1"));
+ assertTrue(writer.toString().contains("Reducing auto parallelism for vertex: scope-56 from 7 to 1"));
} finally {
Util.removeLogAppender("testDecreaseParallelism", PigGraceShuffleVertexManager.class, ShuffleVertexManager.class);
}
@@ -183,7 +183,7 @@
System.out.println(writer.toString());
assertTrue(writer.toString().contains("Initialize parallelism for scope-64 to 45"));
// There are randomness in which task finishes first, so the auto parallelism could result different result
- assertTrue(Pattern.compile("Reduce auto parallelism for vertex: scope-64 to (\\d+)* from 45").matcher(writer.toString()).find());
+ assertTrue(Pattern.compile("Reducing auto parallelism for vertex: scope-64 from 45 to (\\d+)*").matcher(writer.toString()).find());
} finally {
Util.removeLogAppender("testIncreaseParallelism", PigGraceShuffleVertexManager.class, ShuffleVertexManager.class);
}
