Merge branch 'master' of github.com:jclouds/jclouds

* 'master' of github.com:jclouds/jclouds:
  Fixed @Nullable annotation to from javax.annotation to org.jclouds.annotation
  Issue 694: Correcting imports
This commit is contained in:
Adrian Cole 2011-09-30 21:54:12 -07:00
commit 10d479bb22
1 changed files with 2 additions and 4 deletions

View File

@ -23,14 +23,12 @@ import org.jclouds.compute.callables.RunScriptOnNodeUsingSsh;
import org.jclouds.compute.domain.ExecResponse;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.domain.Credentials;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.scriptbuilder.statements.login.UserAdd;
import org.jclouds.ssh.SshClient;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.annotation.Nullable;
import java.io.IOException;
import static org.easymock.EasyMock.*;
import static org.jclouds.compute.options.RunScriptOptions.Builder.wrapInInitScript;
import static org.jclouds.scriptbuilder.domain.Statements.exec;
@ -95,7 +93,7 @@ public class RunScriptOnNodeUsingSshTest {
testMe.call();
}
public void simpleRootTestWithSudoPassword() throws IOException {
public void simpleRootTestWithSudoPassword() {
node = createMock(NodeMetadata.class);
expect(node.getCredentials()).andReturn(new Credentials("tester", "notalot"));
expect(node.getAdminPassword()).andReturn("testpassword!").atLeastOnce();