Author: rohini
Date: Wed Aug  2 13:54:00 2017
New Revision: 1803819

URL: http://svn.apache.org/viewvc?rev=1803819&view=rev
Log:
PIG-5278: Unit test failures because of PIG-5264 (nkollar via rohini)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/excluded-tests-spark
    pig/trunk/test/excluded-tests-tez
    pig/trunk/test/org/apache/pig/test/TestAutoLocalMode.java
    pig/trunk/test/org/apache/pig/test/TestMultiQueryCompiler.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1803819&r1=1803818&r2=1803819&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Aug  2 13:54:00 2017
@@ -40,6 +40,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-5278: Unit test failures because of PIG-5264 (nkollar via rohini)
+
 PIG-5276: building "jar" should not call "clean" (nkollar via szita)
 
 PIG-5246: Modify bin/pig about SPARK_HOME, SPARK_ASSEMBLY_JAR after upgrading 
spark to 2 (liyunzhang)

Modified: pig/trunk/test/excluded-tests-spark
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/excluded-tests-spark?rev=1803819&r1=1803818&r2=1803819&view=diff
==============================================================================
--- pig/trunk/test/excluded-tests-spark (original)
+++ pig/trunk/test/excluded-tests-spark Wed Aug  2 13:54:00 2017
@@ -2,3 +2,5 @@
 **/tez/*.java
 **/TestNativeMapReduce.java
 **/TestCounters.java
+**/TestMultiQueryCompiler.java
+**/TestAutoLocalMode.java
\ No newline at end of file

Modified: pig/trunk/test/excluded-tests-tez
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/excluded-tests-tez?rev=1803819&r1=1803818&r2=1803819&view=diff
==============================================================================
--- pig/trunk/test/excluded-tests-tez (original)
+++ pig/trunk/test/excluded-tests-tez Wed Aug  2 13:54:00 2017
@@ -1,2 +1,4 @@
 **/Test*MR.java
-**/spark/*.java
\ No newline at end of file
+**/spark/*.java
+**/TestMultiQueryCompiler.java
+**/TestAutoLocalMode.java
\ No newline at end of file

Modified: pig/trunk/test/org/apache/pig/test/TestAutoLocalMode.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestAutoLocalMode.java?rev=1803819&r1=1803818&r2=1803819&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestAutoLocalMode.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestAutoLocalMode.java Wed Aug  2 
13:54:00 2017
@@ -33,6 +33,7 @@ import org.apache.log4j.FileAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.SimpleLayout;
+import org.apache.pig.ExecType;
 import org.apache.pig.PigConfiguration;
 import org.apache.pig.PigServer;
 import 
org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.JobControlCompiler;
@@ -40,9 +41,10 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 
+// Auto local mode is not implemented for Spark and Tez (PIG-5281, PIG-5280)
 public class TestAutoLocalMode {
 
-    static MiniGenericCluster cluster = MiniGenericCluster.buildCluster();
+    static MiniGenericCluster cluster = 
MiniGenericCluster.buildCluster(MiniGenericCluster.EXECTYPE_MR);
     private PigServer pigServer;
     private File logFile;
 

Modified: pig/trunk/test/org/apache/pig/test/TestMultiQueryCompiler.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestMultiQueryCompiler.java?rev=1803819&r1=1803818&r2=1803819&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestMultiQueryCompiler.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestMultiQueryCompiler.java Wed Aug  2 
13:54:00 2017
@@ -57,6 +57,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+// This test is specific to MR, not intended to pass in spark and tez mode
 @RunWith(JUnit4.class)
 public class TestMultiQueryCompiler {
 
@@ -66,7 +67,7 @@ public class TestMultiQueryCompiler {
 
     @BeforeClass
     public static void setUpBeforeClass() throws IOException {
-        cluster = MiniGenericCluster.buildCluster();
+        cluster = 
MiniGenericCluster.buildCluster(MiniGenericCluster.EXECTYPE_MR);
         Util.copyFromLocalToCluster(cluster,
                 "test/org/apache/pig/test/data/passwd", "passwd");
         Util.copyFromLocalToCluster(cluster,


Reply via email to