fixed Bluelock tests

This commit is contained in:
Adrian Cole 2011-07-26 22:16:32 -07:00
parent d75589ecc5
commit 1a9d174703
3 changed files with 21 additions and 2 deletions

View File

@ -21,7 +21,9 @@ package org.jclouds.vcloud.bluelock.compute;
import static org.jclouds.compute.util.ComputeServiceUtils.getCores; import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import org.jclouds.compute.domain.ExecResponse;
import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder; import org.jclouds.compute.domain.TemplateBuilder;
@ -66,5 +68,9 @@ public class BluelockVCloudDirectorComputeServiceLiveTest extends VCloudComputeS
assert image.getDefaultCredentials().credential != null : image; assert image.getDefaultCredentials().credential != null : image;
return template; return template;
} }
protected void checkResponseEqualsHostname(ExecResponse execResponse, NodeMetadata node1) {
// hostname is not completely predictable based on node metadata
assert execResponse.getOutput().trim().equals("Ubuntu1004") : execResponse + ": " + node1;
}
} }

View File

@ -21,7 +21,9 @@ package org.jclouds.bluelock.vcloud.vcenterprise.compute;
import static org.jclouds.compute.util.ComputeServiceUtils.getCores; import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import org.jclouds.compute.domain.ExecResponse;
import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder; import org.jclouds.compute.domain.TemplateBuilder;
@ -66,5 +68,9 @@ public class BluelockVCloudEnterpriseComputeServiceLiveTest extends VCloudComput
assert image.getDefaultCredentials().credential != null : image; assert image.getDefaultCredentials().credential != null : image;
return template; return template;
} }
protected void checkResponseEqualsHostname(ExecResponse execResponse, NodeMetadata node1) {
// hostname is not completely predictable based on node metadata
assert execResponse.getOutput().trim().equals("Ubuntu1004") : execResponse + ": " + node1;
}
} }

View File

@ -21,7 +21,9 @@ package org.jclouds.bluelock.vcloud.zone01.compute;
import static org.jclouds.compute.util.ComputeServiceUtils.getCores; import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import org.jclouds.compute.domain.ExecResponse;
import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder; import org.jclouds.compute.domain.TemplateBuilder;
@ -66,5 +68,10 @@ public class BluelockVCloudZone01ComputeServiceLiveTest extends VCloudComputeSer
assert image.getDefaultCredentials().credential != null : image; assert image.getDefaultCredentials().credential != null : image;
return template; return template;
} }
protected void checkResponseEqualsHostname(ExecResponse execResponse, NodeMetadata node1) {
// hostname is not completely predictable based on node metadata
assert execResponse.getOutput().trim().equals("Ubuntu1004") : execResponse + ": " + node1;
}
} }