You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ge...@apache.org on 2018/01/22 13:34:47 UTC
oozie git commit: OOZIE-3145 >git status< should be clean after >mvn
test< was called (kmarton via gezapeti)
Repository: oozie
Updated Branches:
refs/heads/master 5a413c32d -> 823ddbe64
OOZIE-3145 >git status< should be clean after >mvn test< was called (kmarton via gezapeti)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/823ddbe6
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/823ddbe6
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/823ddbe6
Branch: refs/heads/master
Commit: 823ddbe64428fdd31c1b2b91e500f954ff6ad320
Parents: 5a413c3
Author: Gezapeti Cseh <ge...@apache.org>
Authored: Mon Jan 22 14:34:32 2018 +0100
Committer: Gezapeti Cseh <ge...@apache.org>
Committed: Mon Jan 22 14:34:32 2018 +0100
----------------------------------------------------------------------
.../oozie/action/hadoop/TestLauncher.java | 9 ++----
.../org/apache/oozie/client/TestOozieCLI.java | 4 +--
.../oozie/jms/TestJMSJobEventListener.java | 2 ++
.../oozie/service/TestJMSAccessorService.java | 5 ++-
.../java/org/apache/oozie/test/XTestCase.java | 34 ++++++++++++++++++++
release-log.txt | 1 +
.../oozie/action/hadoop/TestHiveMain.java | 7 ++++
.../apache/oozie/action/hadoop/TestPigMain.java | 7 ++++
.../oozie/action/hadoop/TestJarFilter.java | 4 +++
.../oozie/action/hadoop/TestSparkMain.java | 7 ++++
.../apache/oozie/tools/TestOozieMySqlDBCLI.java | 2 +-
11 files changed, 71 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
index a3b3b7b..65465c1 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
@@ -20,14 +20,9 @@ package org.apache.oozie.action.hadoop;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobClient;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.RunningJob;
import org.apache.oozie.test.XFsTestCase;
-import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.service.HadoopAccessorService;
import org.apache.oozie.service.Services;
@@ -36,7 +31,6 @@ import java.io.File;
import java.io.FileWriter;
import java.io.Writer;
import java.net.URI;
-import java.util.Map;
public class TestLauncher extends XFsTestCase {
@@ -140,7 +134,8 @@ public class TestLauncher extends XFsTestCase {
w.write(contents);
w.close();
- File[] dsts = new File[]{new File("dst1.txt"), new File("dist2.txt"), new File("dist3.txt")};
+ File[] dsts = new File[]{new File(getTestCaseDir(), "dst1.txt"), new File(getTestCaseDir(),"dist2.txt"),
+ new File(getTestCaseDir(), "dist3.txt")};
for (File dst : dsts) {
dst.delete();
assertFalse(dst.exists());
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java b/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java
index 8c2aa98..3395cc2 100644
--- a/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java
+++ b/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java
@@ -1286,8 +1286,8 @@ public class TestOozieCLI extends DagServletTestCase {
" <start to=\"end\"/> <end name=\"end\"/> </workflow-app>";
String invalidContent = "<workflow-app xmlns=\"uri:oozie:workflow:0.2\" name=\"f\"> "+
" <tag=\"end\"/> <tag=\"end\"/> </workflow-app>";
- File validfile = new File(validFileName);
- File invalidfile = new File(invalidFileName);
+ File validfile = new File(getTestCaseDir(), validFileName);
+ File invalidfile = new File(getTestCaseDir(), invalidFileName);
validfile.delete();
invalidfile.delete();
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/core/src/test/java/org/apache/oozie/jms/TestJMSJobEventListener.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/jms/TestJMSJobEventListener.java b/core/src/test/java/org/apache/oozie/jms/TestJMSJobEventListener.java
index 728916e..f375dec 100644
--- a/core/src/test/java/org/apache/oozie/jms/TestJMSJobEventListener.java
+++ b/core/src/test/java/org/apache/oozie/jms/TestJMSJobEventListener.java
@@ -335,6 +335,7 @@ public class TestJMSJobEventListener extends XTestCase {
JMSJobEventListener wfEventListener = new JMSJobEventListener();
wfEventListener.init(conf);
BrokerService broker = new BrokerService();
+ broker.setDataDirectory(getTestCaseDir());
broker.addConnector(brokerURl);
broker.start();
ConnectionContext jmsContext = getConnectionContext();
@@ -344,6 +345,7 @@ public class TestJMSJobEventListener extends XTestCase {
// Exception Listener should have removed the old conn context
assertNull(jmsContext);
broker = new BrokerService();
+ broker.setDataDirectory(getTestCaseDir());
broker.addConnector(brokerURl);
broker.start();
WorkflowJobEvent wfe = new WorkflowJobEvent("wfId1", "caId1", WorkflowJob.Status.FAILED, "user1",
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java b/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java
index 505049d..41241d2 100644
--- a/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java
+++ b/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java
@@ -21,7 +21,6 @@ package org.apache.oozie.service;
import java.net.URI;
import java.util.Random;
-import javax.jms.JMSException;
import javax.jms.Session;
import org.apache.activemq.broker.BrokerService;
@@ -141,6 +140,7 @@ public class TestJMSAccessorService extends XTestCase {
ConnectionContext ctx1 = new DefaultConnectionContext();
ctx1.createConnection(connInfo.getJNDIProperties());
BrokerService broker = new BrokerService();
+ broker.setDataDirectory(getTestCaseDir());
// Without this stop testConnectionRetry fails with
// javax.management.InstanceAlreadyExistsException: org.apache.activemq:BrokerName=localhost,Type=Broker
broker.stop();
@@ -177,6 +177,7 @@ public class TestJMSAccessorService extends XTestCase {
// Start the broker and check if listening to topic now
BrokerService broker = new BrokerService();
broker.addConnector(brokerURl);
+ broker.setDataDirectory(getTestCaseDir());
broker.start();
Thread.sleep(1000);
assertTrue(jmsService.isListeningToTopic(connInfo, topic));
@@ -208,6 +209,7 @@ public class TestJMSAccessorService extends XTestCase {
// Start the broker
BrokerService broker = new BrokerService();
broker.addConnector(brokerURL);
+ broker.setDataDirectory(getTestCaseDir());
broker.start();
JMSConnectionInfo connInfo = hcatService.getJMSConnectionInfo(new URI("hcat://hcat.server.com:8020"));
jmsService.registerForNotification(connInfo, topic, new HCatMessageHandler(publisherAuthority));
@@ -228,6 +230,7 @@ public class TestJMSAccessorService extends XTestCase {
}
broker = new BrokerService();
broker.addConnector(brokerURL);
+ broker.setDataDirectory(getTestCaseDir());
broker.start();
Thread.sleep(1000);
assertTrue(jmsService.isListeningToTopic(connInfo, topic));
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/core/src/test/java/org/apache/oozie/test/XTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/test/XTestCase.java b/core/src/test/java/org/apache/oozie/test/XTestCase.java
index 8cecb89..f471b88 100644
--- a/core/src/test/java/org/apache/oozie/test/XTestCase.java
+++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java
@@ -22,12 +22,15 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
+import java.io.FilenameFilter;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.IOException;
import java.net.InetAddress;
import java.net.URL;
+import java.nio.file.Files;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.EnumSet;
import java.net.UnknownHostException;
import java.util.HashMap;
@@ -75,6 +78,7 @@ import org.apache.oozie.CoordinatorJobBean;
import org.apache.oozie.SLAEventBean;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
+import org.apache.oozie.action.hadoop.LauncherMain;
import org.apache.oozie.dependency.FSURIHandler;
import org.apache.oozie.dependency.HCatURIHandler;
import org.apache.oozie.service.ConfigurationService;
@@ -307,6 +311,8 @@ public abstract class XTestCase extends TestCase {
protected void setUp(boolean cleanUpDBTables) throws Exception {
RUNNING_TESTCASES.incrementAndGet();
super.setUp();
+ // if for some reason the tearDown didn`t run, check and delete the files
+ deleteCreatedFiles();
String baseDir = System.getProperty(OOZIE_TEST_DIR, new File("target/test-data").getAbsolutePath());
String msg = null;
File f = new File(baseDir);
@@ -481,12 +487,40 @@ public abstract class XTestCase extends TestCase {
resetSystemProperties();
sysProps = null;
testCaseDir = null;
+ deleteCreatedFiles();
super.tearDown();
RUNNING_TESTCASES.decrementAndGet();
LAST_TESTCASE_FINISHED.set(System.currentTimeMillis());
}
/**
+ * Delete the created files
+ */
+ protected void deleteCreatedFiles() {
+ for (File f : getFilesToDelete()) {
+ if (f.exists()){
+ f.delete();
+ }
+ }
+ }
+
+ /**
+ * Provides a list of files needed to be deleted
+ * @return propagation-conf.xml, log4j.properties, .log files from the working directory
+ */
+ protected List<File> getFilesToDelete() {
+ File root = new File(".");
+ File [] filesToDelete = root.listFiles(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.endsWith(".log") || name.endsWith("log4j.properties") || name.equals(LauncherMain.PROPAGATION_CONF_XML);
+ }
+ });
+ return new ArrayList<>(Arrays.asList(filesToDelete));
+ }
+
+
+ /**
* Return the test working directory. The directory name is the full class name of the test plus the test method
* name.
*
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 4b33ffe..8f68ae9 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.0.0 release (trunk - unreleased)
+OOZIE-3145 >git status< should be clean after >mvn test< was called (kmarton via gezapeti)
OOZIE-3162 amend Precommit build fails to add comment to JIRA (asasvari)
OOZIE-3159 Spark Action fails because of absence of hadoop mapreduce jar(s) (asasvari)
OOZIE-3162 Precommit build fails to add comment to JIRA (asasvari)
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
----------------------------------------------------------------------
diff --git a/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java b/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
index 35c2865..4ec0fed 100644
--- a/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
+++ b/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
@@ -51,6 +51,13 @@ public class TestHiveMain extends MainTestCase {
super.tearDown();
}
+ @Override
+ protected List<File> getFilesToDelete() {
+ List<File> filesToDelete = super.getFilesToDelete();
+ filesToDelete.add(new File(HiveMain.HIVE_SITE_CONF));
+ return filesToDelete;
+ }
+
private static final String NEW_LINE =
System.getProperty("line.separator", "\n");
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/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 9a185c9..6299e02 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
@@ -57,6 +57,13 @@ public class TestPigMain extends PigTestCase {
}
@Override
+ protected List<File> getFilesToDelete() {
+ List<File> filesToDelete = super.getFilesToDelete();
+ filesToDelete.add(new File("pig.properties"));
+ return filesToDelete;
+ }
+
+ @Override
public Void call() throws Exception {
FileSystem fs = getFileSystem();
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestJarFilter.java
----------------------------------------------------------------------
diff --git a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestJarFilter.java b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestJarFilter.java
index ff1b3ce..4b89ea4 100644
--- a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestJarFilter.java
+++ b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestJarFilter.java
@@ -21,11 +21,13 @@ package org.apache.oozie.action.hadoop;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.file.Files;
import java.util.LinkedList;
import java.util.jar.Attributes;
import java.util.jar.JarOutputStream;
@@ -77,6 +79,8 @@ public class TestJarFilter {
assertEquals(sparkYarnJarUri.toString(), jarFilter.getSparkYarnJar());
assertEquals(sparkVersion, jarFilter.getSparkVersion());
checkFilteredUris(listUris, sparkYarnJarUri.toString(), renamedApplicationJar);
+
+ Files.deleteIfExists(new File(sparkYarnJar).toPath());
}
private void checkFilteredUris(LinkedList<URI> listUris, String sparkYarnJar, String applicationJar) {
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkMain.java
----------------------------------------------------------------------
diff --git a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkMain.java b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkMain.java
index b9f37c8..660a4ec 100644
--- a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkMain.java
+++ b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkMain.java
@@ -142,4 +142,11 @@ public class TestSparkMain extends MainTestCase {
expected.add("job_001");
assertEquals(expected, jobIds);
}
+
+ @Override
+ protected List<File> getFilesToDelete() {
+ List<File> filesToDelete = super.getFilesToDelete();
+ filesToDelete.add(new File(SparkMain.HIVE_SITE_CONF));
+ return filesToDelete;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/oozie/blob/823ddbe6/tools/src/test/java/org/apache/oozie/tools/TestOozieMySqlDBCLI.java
----------------------------------------------------------------------
diff --git a/tools/src/test/java/org/apache/oozie/tools/TestOozieMySqlDBCLI.java b/tools/src/test/java/org/apache/oozie/tools/TestOozieMySqlDBCLI.java
index a7df5c7..07a00a2 100644
--- a/tools/src/test/java/org/apache/oozie/tools/TestOozieMySqlDBCLI.java
+++ b/tools/src/test/java/org/apache/oozie/tools/TestOozieMySqlDBCLI.java
@@ -42,7 +42,7 @@ public class TestOozieMySqlDBCLI extends XTestCase {
new LauncherSecurityManager();
this.oozieConfig = System.getProperty("oozie.test.config.file");
- File oozieConfig = new File("src/test/resources/fake-oozie-site.xml");
+ File oozieConfig = new File(getTestCaseConfDir(), "src/test/resources/fake-oozie-site.xml");
System.setProperty("oozie.test.config.file", oozieConfig.getAbsolutePath());
Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
Connection conn = DriverManager.getConnection(url, "sa", "");