mirror of https://github.com/apache/jclouds.git
Merge branch 'master' of https://github.com/aplowe/jclouds into aplowe-master
Conflicts: compute/src/test/java/org/jclouds/compute/callable/RunScriptOnNodeUsingSshTest.java
This commit is contained in:
commit
9049cb3b28
|
@ -29,8 +29,6 @@ import org.jclouds.ssh.SshClient;
|
||||||
import org.testng.annotations.BeforeMethod;
|
import org.testng.annotations.BeforeMethod;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import static org.easymock.EasyMock.*;
|
import static org.easymock.EasyMock.*;
|
||||||
import static org.jclouds.compute.options.RunScriptOptions.Builder.wrapInInitScript;
|
import static org.jclouds.compute.options.RunScriptOptions.Builder.wrapInInitScript;
|
||||||
import static org.jclouds.scriptbuilder.domain.Statements.exec;
|
import static org.jclouds.scriptbuilder.domain.Statements.exec;
|
||||||
|
@ -95,7 +93,7 @@ public class RunScriptOnNodeUsingSshTest {
|
||||||
testMe.call();
|
testMe.call();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void simpleRootTestWithSudoPassword() throws IOException {
|
public void simpleRootTestWithSudoPassword() {
|
||||||
node = createMock(NodeMetadata.class);
|
node = createMock(NodeMetadata.class);
|
||||||
expect(node.getCredentials()).andReturn(new Credentials("tester", "notalot"));
|
expect(node.getCredentials()).andReturn(new Credentials("tester", "notalot"));
|
||||||
expect(node.getAdminPassword()).andReturn("testpassword!").atLeastOnce();
|
expect(node.getAdminPassword()).andReturn("testpassword!").atLeastOnce();
|
||||||
|
|
Loading…
Reference in New Issue