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

fixed things visibly wrong

This commit is contained in:
Adrian Cole 2012-07-25 22:45:25 -07:00
parent 0bc602a3d2
commit 23f84a9114
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
labs/joyent-cloudapi/src/test/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineApiLiveTest.java
View File

@ -31,7 +31,6 @@ import org.jclouds.crypto.SshKeys;
import org.jclouds.domain.LoginCredentials; import org.jclouds.domain.LoginCredentials;
import org.jclouds.joyent.cloudapi.v6_5.domain.Key; import org.jclouds.joyent.cloudapi.v6_5.domain.Key;
import org.jclouds.joyent.cloudapi.v6_5.domain.Machine; import org.jclouds.joyent.cloudapi.v6_5.domain.Machine;
import org.jclouds.joyent.cloudapi.v6_5.features.MachineApi;
import org.jclouds.joyent.cloudapi.v6_5.internal.BaseJoyentCloudApiLiveTest; import org.jclouds.joyent.cloudapi.v6_5.internal.BaseJoyentCloudApiLiveTest;
import org.jclouds.joyent.cloudapi.v6_5.options.CreateMachineOptions; import org.jclouds.joyent.cloudapi.v6_5.options.CreateMachineOptions;
import org.jclouds.joyent.cloudapi.v6_5.reference.Metadata; import org.jclouds.joyent.cloudapi.v6_5.reference.Metadata;
@ -41,7 +40,7 @@ import org.jclouds.ssh.SshClient;
import org.jclouds.sshj.config.SshjSshClientModule; import org.jclouds.sshj.config.SshjSshClientModule;
import org.jclouds.util.InetAddresses2; import org.jclouds.util.InetAddresses2;
import org.testng.annotations.AfterGroups; import org.testng.annotations.AfterGroups;
import org.testng.annotations.BeforeGroups; import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
@ -88,7 +87,7 @@ public class MachineApiLiveTest extends BaseJoyentCloudApiLiveTest {
protected String datasetURN = System.getProperty("test." + provider + ".image-id", "sdc:sdc:ubuntu-10.04:1.0.1"); protected String datasetURN = System.getProperty("test." + provider + ".image-id", "sdc:sdc:ubuntu-10.04:1.0.1");
private String name; private String name;
@BeforeGroups(groups = { "integration", "live" }) @BeforeClass(groups = { "integration", "live" })
@Override @Override
public void setupContext() { public void setupContext() {
super.setupContext(); super.setupContext();
@ -106,14 +105,6 @@ public class MachineApiLiveTest extends BaseJoyentCloudApiLiveTest {
} }
}, 600, 5, 5, TimeUnit.SECONDS); }, 600, 5, 5, TimeUnit.SECONDS);
machineRunning = new RetryablePredicate<Machine>(new Predicate<Machine>() {
@Override
public boolean apply(Machine input) {
return api.get(input.getId()).getState() == Machine.State.RUNNING;
}
}, 600, 5, 5, TimeUnit.SECONDS);
} }
public void testCreateMachine() { public void testCreateMachine() {

2
labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
View File

@ -163,7 +163,7 @@ public class Image extends Resource {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hashCode(containerFormat, diskFormat, size, checksum); return Objects.hashCode(super.hashCode(), containerFormat, diskFormat, size, checksum);
} }
@Override @Override