You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/09/11 22:29:44 UTC
[5/5] git commit: SLIDER-422. Automatically upload slider-agent
tarball to the app instance directory
SLIDER-422. Automatically upload slider-agent tarball to the app instance directory
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/219e7f8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/219e7f8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/219e7f8e
Branch: refs/heads/develop
Commit: 219e7f8e3f2888209934913eaa26972ec446bc4f
Parents: db67363
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Sep 11 12:45:16 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Sep 11 12:45:16 2014 -0700
----------------------------------------------------------------------
.../providers/agent/TestAgentProviderService.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/219e7f8e/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java
index aa9dd60..b652bb5 100644
--- a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java
+++ b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java
@@ -272,9 +272,10 @@ public class TestAgentProviderService {
MapOperations resourceComponent = new MapOperations();
MapOperations appComponent = new MapOperations();
Path containerTmpDirPath = new Path(".", "test");
- FileSystem mockFs = new MockFileSystem();
+ FileSystem mockFs = createNiceMock(FileSystem.class);
+ expect(mockFs.exists(anyObject(Path.class))).andReturn(true);
expect(sliderFileSystem.getFileSystem())
- .andReturn(new FilterFileSystem(mockFs)).anyTimes();
+ .andReturn(mockFs).anyTimes();
expect(sliderFileSystem.createAmResource(anyObject(Path.class),
anyObject(LocalResourceType.class)))
.andReturn(createNiceMock(LocalResource.class)).anyTimes();
@@ -331,7 +332,7 @@ public class TestAgentProviderService {
treeOps.set(OptionKeys.APPLICATION_NAME, "HBASE");
expect(access.getInstanceDefinitionSnapshot()).andReturn(aggConf);
expect(access.getInternalsSnapshot()).andReturn(treeOps).anyTimes();
- replay(access, ctx, container, sliderFileSystem);
+ replay(access, ctx, container, sliderFileSystem, mockFs);
try {
mockAps.buildContainerLaunchContext(launcher,
@@ -423,7 +424,9 @@ public class TestAgentProviderService {
AgentProviderService mockAps = Mockito.spy(aps);
doReturn(access).when(mockAps).getAmState();
- doReturn("scripts/hbase_master.py").when(mockAps)
+ CommandScript cs = new CommandScript();
+ cs.setScript("scripts/hbase_master.py");
+ doReturn(cs).when(mockAps)
.getScriptPathFromMetainfo(anyString());
Metainfo metainfo = new Metainfo();
Application application = new Application();
@@ -922,9 +925,10 @@ public class TestAgentProviderService {
MapOperations resourceComponent = new MapOperations();
MapOperations appComponent = new MapOperations();
Path containerTmpDirPath = new Path(".", "test");
- FileSystem mockFs = new MockFileSystem();
+ FilterFileSystem mockFs = createNiceMock(FilterFileSystem.class);
expect(sliderFileSystem.getFileSystem())
- .andReturn(new FilterFileSystem(mockFs)).anyTimes();
+ .andReturn(mockFs).anyTimes();
+ expect(mockFs.exists(anyObject(Path.class))).andReturn(true);
expect(sliderFileSystem.createAmResource(anyObject(Path.class),
anyObject(LocalResourceType.class)))
.andReturn(createNiceMock(LocalResource.class)).anyTimes();
@@ -982,7 +986,7 @@ public class TestAgentProviderService {
treeOps.set(OptionKeys.APPLICATION_NAME, "HBASE");
expect(access.getInstanceDefinitionSnapshot()).andReturn(aggConf).anyTimes();
expect(access.getInternalsSnapshot()).andReturn(treeOps).anyTimes();
- replay(access, ctx, container, sliderFileSystem);
+ replay(access, ctx, container, sliderFileSystem, mockFs);
// build two containers
try {