You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2016/08/02 20:42:13 UTC
oozie git commit: OOZIE-2497 Some tests fail on windows due to hard
coded URIs (abhishekbafna via rkanter)
Repository: oozie
Updated Branches:
refs/heads/master 29f69b108 -> 376507fb8
OOZIE-2497 Some tests fail on windows due to hard coded URIs (abhishekbafna via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/376507fb
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/376507fb
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/376507fb
Branch: refs/heads/master
Commit: 376507fb8f668d420b9c1081ff65a0a2b2f080d1
Parents: 29f69b1
Author: Robert Kanter <rk...@cloudera.com>
Authored: Tue Aug 2 13:42:03 2016 -0700
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Tue Aug 2 13:42:03 2016 -0700
----------------------------------------------------------------------
.../org/apache/oozie/command/coord/TestCoordSubmitXCommand.java | 2 +-
.../test/java/org/apache/oozie/command/wf/TestSignalXCommand.java | 2 +-
release-log.txt | 1 +
.../apache/oozie/action/hadoop/TestMapReduceActionExecutor.java | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/376507fb/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
index 52eb9dd..dcc97ad 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
@@ -570,7 +570,7 @@ public class TestCoordSubmitXCommand extends XDataTestCase {
public void testELdataIO_xsd_4() throws Exception {
Configuration conf = new XConfiguration();
- String appPath = "file://" + getTestCaseDir() + File.separator + "coordinator.xml";
+ String appPath = new File(getTestCaseDir(), "coordinator.xml").toURI().toString();
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf);
http://git-wip-us.apache.org/repos/asf/oozie/blob/376507fb/core/src/test/java/org/apache/oozie/command/wf/TestSignalXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestSignalXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestSignalXCommand.java
index 810bc1e..1f6333c 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestSignalXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestSignalXCommand.java
@@ -108,7 +108,7 @@ public class TestSignalXCommand extends XDataTestCase {
final DagEngine engine = new DagEngine("u");
XConfiguration conf = new XConfiguration();
- conf.set(OozieClient.APP_PATH, appPath.toString() + File.separator + "workflow.xml");
+ conf.set(OozieClient.APP_PATH, new Path(appPath, "workflow.xml").toString());
conf.set(OozieClient.USER_NAME, getTestUser());
final String jobId = engine.submitJob(conf, false);
http://git-wip-us.apache.org/repos/asf/oozie/blob/376507fb/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 48bc14c..4dec531 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2497 Some tests fail on windows due to hard coded URIs (abhishekbafna via rkanter)
OOZIE-2349 Method getCoordJobInfo(String jobId, String filter, int offset, int length, boolean desc) is not present in LocalOozieClientCoord (nperiwal via rkanter)
OOZIE-2172 ZooKeeper Security Tests failed with JVM IBM JAVA (GauravPande via rkanter)
OOZIE-2555 Oozie SSL enable setup does not return port for admin -servers (abhishekbafna via rkanter)
http://git-wip-us.apache.org/repos/asf/oozie/blob/376507fb/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
----------------------------------------------------------------------
diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
index d4095da..2713526 100644
--- a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
+++ b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
@@ -124,7 +124,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
conf.set("nameNode", getNameNodeUri());
conf.set("jobTracker", getJobTrackerUri());
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml");
+ conf.set(OozieClient.APP_PATH, new File(getTestCaseDir(), "workflow.xml").toURI().toString());
conf.set(OozieClient.LOG_TOKEN, "t");
OutputStream os = new FileOutputStream(getTestCaseDir() + "/config-default.xml");