svn commit: r1644144 - in /pig/trunk: CHANGES.txt test/org/apache/pig/test/TestPigRunner.java

[daijy]

Author: daijy
Date: Tue Dec  9 18:26:27 2014
New Revision: 1644144

URL: http://svn.apache.org/r1644144
Log:
PIG-4351: TestPigRunner.simpleTest2 fail on trunk

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/org/apache/pig/test/TestPigRunner.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1644144&r1=1644143&r2=1644144&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Dec  9 18:26:27 2014
@@ -28,6 +28,8 @@ PIG-4333: Split BigData tests into multi
  
 BUG FIXES
 
+PIG-4351: TestPigRunner.simpleTest2 fail on trunk (daijy)
+
 PIG-4350: Port local mode tests to Tez - part2 (daijy)
 
 PIG-4326: AvroStorageSchemaConversionUtilities does not properly convert 
schema for maps of arrays of records (mprim via daijy)

Modified: pig/trunk/test/org/apache/pig/test/TestPigRunner.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPigRunner.java?rev=1644144&r1=1644143&r2=1644144&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPigRunner.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPigRunner.java Tue Dec  9 18:26:27 
2014
@@ -196,10 +196,14 @@ public class TestPigRunner {
             String[] args = { "-Dstop.on.failure=true", 
"-Dopt.multiquery=false", "-Daggregate.warning=false", "-x", execType, PIG_FILE 
};
             PigStats stats = PigRunner.run(args, new 
TestNotificationListener(execType));
 
-            assertTrue(stats instanceof EmptyPigStats);
             assertTrue(stats.isSuccessful());
-            assertEquals(0, stats.getNumberJobs());
-            assertEquals(stats.getJobGraph().size(), 0);
+            if (execType.toString().startsWith("tez")) {
+                assertEquals(1, stats.getNumberJobs());
+                assertEquals(stats.getJobGraph().size(), 1);
+            } else {
+                assertEquals(2, stats.getNumberJobs());
+                assertEquals(stats.getJobGraph().size(), 2);
+            }
 
             Configuration conf = 
ConfigurationUtil.toConfiguration(stats.getPigProperties());
             assertTrue(conf.getBoolean("stop.on.failure", false));