svn commit: r1663429 - in /pig/trunk: CHANGES.txt test/org/apache/pig/builtin/TestAvroStorage.java test/tez-local-tests

[da...@apache.org]

Author: daijy
Date: Mon Mar  2 20:54:12 2015
New Revision: 1663429

URL: http://svn.apache.org/r1663429
Log:
PIG-4264: Port TestAvroStorage to tez local mode

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/org/apache/pig/builtin/TestAvroStorage.java
    pig/trunk/test/tez-local-tests

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1663429&r1=1663428&r2=1663429&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Mar  2 20:54:12 2015
@@ -50,6 +50,8 @@ PIG-4333: Split BigData tests into multi
  
 BUG FIXES
 
+PIG-4264: Port TestAvroStorage to tez local mode (daijy)
+
 PIG-4437: Fix tez unit test failure TestJoinSmoke, TestSkewedJoin (daijy)
 
 PIG-4432: Built-in VALUELIST and VALUESET UDFs do not preserve the schema when the map value type is

Modified: pig/trunk/test/org/apache/pig/builtin/TestAvroStorage.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/builtin/TestAvroStorage.java?rev=1663429&r1=1663428&r2=1663429&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/builtin/TestAvroStorage.java (original)
+++ pig/trunk/test/org/apache/pig/builtin/TestAvroStorage.java Mon Mar  2 20:54:12 2015
@@ -52,9 +52,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.PathFilter;
-import org.apache.pig.ExecType;
 import org.apache.pig.PigServer;
-import org.apache.pig.backend.executionengine.ExecException;
 import org.apache.pig.backend.executionengine.ExecJob;
 import org.apache.pig.backend.executionengine.ExecJob.JOB_STATUS;
 import org.apache.pig.builtin.mock.Storage.Data;
@@ -131,8 +129,8 @@ public class TestAvroStorage {
     }
 
     @BeforeClass
-    public static void setup() throws ExecException, IOException {
-        pigServerLocal = new PigServer(ExecType.LOCAL);
+    public static void setup() throws Exception {
+        pigServerLocal = new PigServer(Util.getLocalTestMode());
         Util.deleteDirectory(new File(outbasedir));
         generateInputFiles();
     }
@@ -828,7 +826,7 @@ public class TestAvroStorage {
 
     @Test
     public void testRetrieveDataFromMap() throws Exception {
-        pigServerLocal = new PigServer(ExecType.LOCAL);
+        pigServerLocal = new PigServer(Util.getLocalTestMode());
         Data data = resetData(pigServerLocal);
         Map<String, String> mapv1 = new HashMap<String, String>();
         mapv1.put("key1", "v11");

Modified: pig/trunk/test/tez-local-tests
URL: http://svn.apache.org/viewvc/pig/trunk/test/tez-local-tests?rev=1663429&r1=1663428&r2=1663429&view=diff
==============================================================================
--- pig/trunk/test/tez-local-tests (original)
+++ pig/trunk/test/tez-local-tests Mon Mar  2 20:54:12 2015
@@ -84,3 +84,4 @@
 **/TestPOPartialAggPlanTez.java
 **/TestMultiQueryLocal.java
 **/TestUnionOnSchema.java
+**/TestAvroStorage.java