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/11/05 16:24:22 UTC
incubator-slider git commit: SLIDER-961 fix inverted condition on
install operation, plus improve log output in TestAgentClientProvider2
Repository: incubator-slider
Updated Branches:
refs/heads/develop a66f7db83 -> fed5d0346
SLIDER-961 fix inverted condition on install operation, plus improve log output in TestAgentClientProvider2
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fed5d034
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fed5d034
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fed5d034
Branch: refs/heads/develop
Commit: fed5d03469f87642fce740e56847a0e38e396242
Parents: a66f7db
Author: Steve Loughran <st...@apache.org>
Authored: Thu Nov 5 15:24:05 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Nov 5 15:24:05 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/slider/client/SliderClient.java | 4 ++--
.../apache/slider/providers/agent/TestAgentClientProvider2.java | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fed5d034/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 07c915c..eeda1e3 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
@@ -1161,11 +1161,11 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
require(clientInfo.installLocation.exists(),
E_INSTALL_PATH_DOES_NOT_EXIST + ": " + clientInfo.installLocation.getAbsolutePath());
- require(clientInfo.installLocation.isFile(),
+ require(clientInfo.installLocation.isDirectory(),
E_INVALID_INSTALL_PATH + ": " + clientInfo.installLocation.getAbsolutePath());
File pkgFile;
- requireArgumentSet(Arguments.ARG_PACKAGE, clientInfo.packageURI);
+ require(isSet(clientInfo.packageURI), E_INVALID_APPLICATION_PACKAGE_LOCATION);
pkgFile = new File(clientInfo.packageURI);
require(pkgFile.isFile(),
E_UNABLE_TO_READ_SUPPLIED_PACKAGE_FILE + " at %s", pkgFile.getAbsolutePath());
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fed5d034/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentClientProvider2.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentClientProvider2.java b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentClientProvider2.java
index 1fbbfce..b919fcf 100644
--- a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentClientProvider2.java
+++ b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentClientProvider2.java
@@ -44,6 +44,7 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.slf4j.Logger;
@@ -62,6 +63,7 @@ import static org.easymock.EasyMock.expect;
*
*/
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore("org.apache.log4j.*")
@PrepareForTest({ProviderUtils.class, ProcessBuilder.class, AgentClientProvider.class, RegistryUtils.class})
public class TestAgentClientProvider2 extends SliderTestUtils {
protected static final Logger log =
@@ -235,6 +237,8 @@ public class TestAgentClientProvider2 extends SliderTestUtils {
@Test
public void testSliderClientForInstallFailures() throws Exception {
+ describe(" IGNORE ANY STACK TRACES BELOW ");
+
SliderClient client = new SliderClient();
client.bindArgs(new Configuration(), "client", "--dest", "a_random_path/none", "--package", "a_random_pkg.zip");
ActionClientArgs args = new ActionClientArgs();
@@ -274,6 +278,7 @@ public class TestAgentClientProvider2 extends SliderTestUtils {
assertExceptionDetails(e, SliderExitCodes.EXIT_BAD_CONFIGURATION,
SliderClient.E_MUST_BE_A_VALID_JSON_FILE);
}
+ describe(" END IGNORE ");
args.clientConfig = null;
try {