svn commit: r1689011 - /pig/branches/spark/test/org/apache/pig/test/TestAssert.java

[xuefu]

Author: xuefu
Date: Fri Jul  3 12:51:09 2015
New Revision: 1689011

URL: http://svn.apache.org/r1689011
Log:
PIG-4613: Fix unit test failures about TestAssert (Xianda via Xuefu)

Modified:
    pig/branches/spark/test/org/apache/pig/test/TestAssert.java

Modified: pig/branches/spark/test/org/apache/pig/test/TestAssert.java
URL: 
http://svn.apache.org/viewvc/pig/branches/spark/test/org/apache/pig/test/TestAssert.java?rev=1689011&r1=1689010&r2=1689011&view=diff
==============================================================================
--- pig/branches/spark/test/org/apache/pig/test/TestAssert.java (original)
+++ pig/branches/spark/test/org/apache/pig/test/TestAssert.java Fri Jul  3 
12:51:09 2015
@@ -116,8 +116,14 @@ public class TestAssert {
       try {
           pigServer.openIterator("A");
       } catch (FrontendException fe) {
-          Assert.assertTrue(fe.getCause().getMessage().contains(
-                  "Job terminated with anomalous status FAILED"));
+          if (!Util.isSparkExecType(Util.getLocalTestMode())) {
+              Assert.assertTrue(fe.getCause().getMessage().contains(
+                      "Job terminated with anomalous status FAILED"));
+          }
+          else {
+              Assert.assertTrue(fe.getCause().getMessage().contains(
+                      "i should be greater than 1"));
+          }
       }
   }
 
@@ -142,8 +148,14 @@ public class TestAssert {
       try {
           pigServer.openIterator("A");
       } catch (FrontendException fe) {
-          Assert.assertTrue(fe.getCause().getMessage().contains(
-                  "Job terminated with anomalous status FAILED"));
+          if (!Util.isSparkExecType(Util.getLocalTestMode())) {
+              Assert.assertTrue(fe.getCause().getMessage().contains(
+                      "Job terminated with anomalous status FAILED"));
+          }
+          else {
+              Assert.assertTrue(fe.getCause().getMessage().contains(
+                      "i should be greater than 1"));
+          }
       }
   }