Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed gogrid test

This commit is contained in:
Adrian Cole 2010-03-14 18:17:48 -07:00
parent 2bddd8e70f
commit b221f8006f
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java
View File

@ -67,7 +67,7 @@ import com.google.inject.Injector;
import com.google.inject.Module; import com.google.inject.Module;
/** /**
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", enabled = true, sequential = true, testName = "compute.ComputeServiceLiveTest") @Test(groups = "live", enabled = true, sequential = true, testName = "compute.ComputeServiceLiveTest")
@ -119,7 +119,13 @@ public abstract class BaseComputeServiceLiveTest {
abstract protected Module getSshModule(); abstract protected Module getSshModule();
@Test(enabled = true) public void testTemplateMatch() throws Exception {
template = buildTemplate(client.templateBuilder());
Template toMatch = client.templateBuilder().imageId(template.getImage().getId()).build();
assertEquals(toMatch, template);
}
@Test(dependsOnMethods = "testTemplateMatch")
public void testCreate() throws Exception { public void testCreate() throws Exception {
try { try {
client.destroyNodesWithTag(tag); client.destroyNodesWithTag(tag);
@ -130,11 +136,8 @@ public abstract class BaseComputeServiceLiveTest {
} }
template = buildTemplate(client.templateBuilder()); template = buildTemplate(client.templateBuilder());
template template.getOptions().installPrivateKey(keyPair.get("private")).authorizePublicKey(
.getOptions() keyPair.get("public")).runScript(buildScript().getBytes());
.installPrivateKey(keyPair.get("private"))
.authorizePublicKey(keyPair.get("public"))
.runScript(buildScript().getBytes());
nodes = Sets.newTreeSet(client.runNodesWithTag(tag, 2, template).values()); nodes = Sets.newTreeSet(client.runNodesWithTag(tag, 2, template).values());
assertEquals(nodes.size(), 2); assertEquals(nodes.size(), 2);
checkNodes(); checkNodes();
@ -170,17 +173,16 @@ public abstract class BaseComputeServiceLiveTest {
protected abstract Template buildTemplate(TemplateBuilder templateBuilder); protected abstract Template buildTemplate(TemplateBuilder templateBuilder);
protected String buildScript() { protected String buildScript() {
return return new StringBuilder()//
new StringBuilder()// .append("echo nameserver 208.67.222.222 >> /etc/resolv.conf\n")//
.append("echo nameserver 208.67.222.222 >> /etc/resolv.conf\n")// .append("cp /etc/apt/sources.list /etc/apt/sources.list.old\n")//
.append("cp /etc/apt/sources.list /etc/apt/sources.list.old\n")// .append(
.append( "sed 's~us.archive.ubuntu.com~mirror.anl.gov/pub~g' /etc/apt/sources.list.old >/etc/apt/sources.list\n")//
"sed 's~us.archive.ubuntu.com~mirror.anl.gov/pub~g' /etc/apt/sources.list.old >/etc/apt/sources.list\n")// .append("apt-get update\n")//
.append("apt-get update\n")// .append("apt-get install -f -y --force-yes openjdk-6-jdk\n")//
.append("apt-get install -f -y --force-yes openjdk-6-jdk\n")// .append("wget -qO/usr/bin/runurl run.alestic.com/runurl\n")//
.append("wget -qO/usr/bin/runurl run.alestic.com/runurl\n")// .append("chmod 755 /usr/bin/runurl\n")//
.append("chmod 755 /usr/bin/runurl\n")// .toString();
.toString();
} }
@Test(enabled = true, dependsOnMethods = "testCreate") @Test(enabled = true, dependsOnMethods = "testCreate")

4
gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java
View File

@ -55,15 +55,13 @@ public class GoGridComputeServiceLiveTest extends BaseComputeServiceLiveTest {
@Override @Override
public String buildScript() { public String buildScript() {
return new StringBuilder() return new StringBuilder()
//
.append("echo nameserver 208.67.222.222 >> /etc/resolv.conf\n") .append("echo nameserver 208.67.222.222 >> /etc/resolv.conf\n")
//
.append("echo \"[jdkrepo]\" >> /etc/yum.repos.d/CentOS-Base.repo\n") .append("echo \"[jdkrepo]\" >> /etc/yum.repos.d/CentOS-Base.repo\n")
.append("echo \"name=jdkrepository\" >> /etc/yum.repos.d/CentOS-Base.repo\n") .append("echo \"name=jdkrepository\" >> /etc/yum.repos.d/CentOS-Base.repo\n")
.append( .append(
"echo \"baseurl=http://ec2-us-east-mirror.rightscale.com/epel/5/i386/\" >> /etc/yum.repos.d/CentOS-Base.repo\n") "echo \"baseurl=http://ec2-us-east-mirror.rightscale.com/epel/5/i386/\" >> /etc/yum.repos.d/CentOS-Base.repo\n")
.append("echo \"enabled=1\" >> /etc/yum.repos.d/CentOS-Base.repo\n") .append("echo \"enabled=1\" >> /etc/yum.repos.d/CentOS-Base.repo\n")
.append("yum -y install java-1.6.0-openjdk\n") .append("yum --nogpgcheck -y install java-1.6.0-openjdk\n")
.append( .append(
"echo \"export PATH=\\\"/usr/lib/jvm/jre-1.6.0-openjdk/bin/:\\$PATH\\\"\" >> /root/.bashrc\n") "echo \"export PATH=\\\"/usr/lib/jvm/jre-1.6.0-openjdk/bin/:\\$PATH\\\"\" >> /root/.bashrc\n")
.toString(); .toString();