From 23f84a911420cfbf96aab6269fb5a76bc7dbe155 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Wed, 25 Jul 2012 22:45:25 -0700
Subject: [PATCH] fixed things visibly wrong

---
 .../cloudapi/v6_5/features/MachineApiLiveTest.java  | 13 ++-----------
 .../jclouds/openstack/glance/v1_0/domain/Image.java |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/labs/joyent-cloudapi/src/test/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineApiLiveTest.java b/labs/joyent-cloudapi/src/test/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineApiLiveTest.java
index ceb441ab28..1e35d381ab 100644
--- a/labs/joyent-cloudapi/src/test/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineApiLiveTest.java
+++ b/labs/joyent-cloudapi/src/test/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineApiLiveTest.java
@@ -31,7 +31,6 @@ import org.jclouds.crypto.SshKeys;
 import org.jclouds.domain.LoginCredentials;
 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.features.MachineApi;
 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.reference.Metadata;
@@ -41,7 +40,7 @@ import org.jclouds.ssh.SshClient;
 import org.jclouds.sshj.config.SshjSshClientModule;
 import org.jclouds.util.InetAddresses2;
 import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 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");
    private String name;
 
-   @BeforeGroups(groups = { "integration", "live" })
+   @BeforeClass(groups = { "integration", "live" })
    @Override
    public void setupContext() {
       super.setupContext();
@@ -106,14 +105,6 @@ public class MachineApiLiveTest extends BaseJoyentCloudApiLiveTest {
          }
 
       }, 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() {
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java b/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
index f390b42ef5..32e32aa077 100644
--- a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
+++ b/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
@@ -163,7 +163,7 @@ public class Image extends Resource {
 
    @Override
    public int hashCode() {
-      return Objects.hashCode(containerFormat, diskFormat, size, checksum);
+      return Objects.hashCode(super.hashCode(), containerFormat, diskFormat, size, checksum);
    }
 
    @Override