You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/04/29 00:02:34 UTC
incubator-slider git commit: SLIDER-863 package list command lists
full URI of instances for cross-platform support; tests adapt
Repository: incubator-slider
Updated Branches:
refs/heads/feature/SLIDER-863-windows-tests 98e3244a1 -> 53e05aad0
SLIDER-863 package list command lists full URI of instances for cross-platform support; tests adapt
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/53e05aad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/53e05aad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/53e05aad
Branch: refs/heads/feature/SLIDER-863-windows-tests
Commit: 53e05aad0fa624ed68628398e9fe1f757c4e7b67
Parents: 98e3244
Author: Steve Loughran <st...@apache.org>
Authored: Tue Apr 28 23:02:19 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Apr 28 23:02:19 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/slider/client/SliderClient.java | 2 +-
.../apache/slider/client/TestPackageCommandOptions.groovy | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/53e05aad/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index b856fb6..6baeed6 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -1400,7 +1400,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
if (!appDefPath.isUriPathAbsolute()) {
appDefPath = new Path(fs.getHomeDirectory(), appDefPath);
}
- String appDefPathStr = appDefPath.toUri().getPath();
+ String appDefPathStr = appDefPath.toUri().toString();
try {
if (appDefPathStr.contains(pkgPathValue) && fs.isFile(appDefPath)) {
String packageName = appDefPath.getParent().getName();
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/53e05aad/slider-core/src/test/groovy/org/apache/slider/client/TestPackageCommandOptions.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/client/TestPackageCommandOptions.groovy b/slider-core/src/test/groovy/org/apache/slider/client/TestPackageCommandOptions.groovy
index 13d0190..4260764 100644
--- a/slider-core/src/test/groovy/org/apache/slider/client/TestPackageCommandOptions.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/client/TestPackageCommandOptions.groovy
@@ -153,11 +153,11 @@ class TestPackageCommandOptions extends AgentMiniClusterTestBase {
assert enumeratedInstance.applicationReport.name ==
clustername
def outText = outFile.text
- assert outText.contains(installedPackage.absolutePath)
+ assert outText.contains(installedPackage.toURI().toString())
assert outText.contains(APP_NAME)
assert outText.contains(clustername)
assert outText.matches("(?s).*" + clustername + " +" + APP_NAME + " +"
- + installedPackage.absolutePath + ".*")
+ + installedPackage.toURI() + ".*")
}
@Test
@@ -224,11 +224,11 @@ class TestPackageCommandOptions extends AgentMiniClusterTestBase {
assert enumeratedInstance != null
assert enumeratedInstance.applicationReport.name == clustername
def outText = outFile.text
- assert outText.contains(installedPackage.absolutePath)
+ assert outText.contains(installedPackage.toURI().toString())
assert outText.contains(APP_NAME)
assert outText.contains(clustername)
assert outText.matches("(?s).*" + clustername + " +" + APP_NAME + " +"
- + APP_VERSION + " +" + installedPackage.absolutePath + ".*")
+ + APP_VERSION + " +" + installedPackage.toURI() + ".*")
}
private File getTempLocation () {