Repository: oozie
Updated Branches:
  refs/heads/master 792e46716 -> 87f15e04d


OOZIE-2382 
org.apache.oozie.action.hadoop.TestPigMain.testPig_withNullExternalID is flakey 
addendum (rkanter)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/87f15e04
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/87f15e04
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/87f15e04

Branch: refs/heads/master
Commit: 87f15e04d4389ffea8d93b75b9c74d73eaa0ce41
Parents: 792e467
Author: Robert Kanter <rkan...@cloudera.com>
Authored: Fri Oct 9 11:22:23 2015 -0700
Committer: Robert Kanter <rkan...@cloudera.com>
Committed: Fri Oct 9 11:22:23 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java | 1 +
 .../src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java  | 1 +
 .../java/org/apache/oozie/action/hadoop/TestPigMainWithOldAPI.java | 2 ++
 3 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/87f15e04/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
----------------------------------------------------------------------
diff --git 
a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
 
b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
index 27cae7b..09d3da3 100644
--- 
a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
+++ 
b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
@@ -78,6 +78,7 @@ public class TestPigActionExecutor extends 
ActionExecutorTestCase {
     protected void setUp() throws Exception {
         System.setProperty("oozie.test.metastore.server", "false");
         super.setUp();
+        PigTestCase.resetPigStats();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/oozie/blob/87f15e04/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
----------------------------------------------------------------------
diff --git 
a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java 
b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
index f3ade51..1ea612d 100644
--- a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
+++ b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
@@ -43,6 +43,7 @@ public class TestPigMain extends PigTestCase {
         System.setProperty("oozie.test.metastore.server", "false");
         super.setUp();
         SECURITY_MANAGER = System.getSecurityManager();
+        resetPigStats();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/oozie/blob/87f15e04/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMainWithOldAPI.java
----------------------------------------------------------------------
diff --git 
a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMainWithOldAPI.java
 
b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMainWithOldAPI.java
index fab5e34..e52e6fd 100644
--- 
a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMainWithOldAPI.java
+++ 
b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMainWithOldAPI.java
@@ -51,10 +51,12 @@ public class TestPigMainWithOldAPI extends XFsTestCase 
implements Callable<Void>
     protected void setUp() throws Exception {
         super.setUp();
         SECURITY_MANAGER = System.getSecurityManager();
+        PigTestCase.resetPigStats();
     }
 
     protected void tearDown() throws Exception {
         System.setSecurityManager(SECURITY_MANAGER);
+        PigTestCase.resetPigStats();
         super.tearDown();
     }
 

Reply via email to