test updates now that bluelock is no longer 1.0.0

This commit is contained in:
Adrian Cole 2012-03-16 00:45:32 -07:00
parent 74891be16f
commit 16a44b2e02
2 changed files with 4 additions and 12 deletions

View File

@ -53,6 +53,10 @@ public class BluelockVCloudZone01TemplateBuilderLiveTest extends BaseTemplateBui
switch (input.family) { switch (input.family) {
case UBUNTU: case UBUNTU:
return !input.version.equals("") || !input.is64Bit; return !input.version.equals("") || !input.is64Bit;
case RHEL:
return !input.version.equals("");
case WINDOWS:
return !input.version.equals("");
default: default:
return true; return true;
} }

View File

@ -18,7 +18,6 @@
*/ */
package org.jclouds.bluelock.vcloud.zone01.features; package org.jclouds.bluelock.vcloud.zone01.features;
import org.jclouds.compute.domain.ExecResponse;
import org.jclouds.vcloud.features.VmClientLiveTest; import org.jclouds.vcloud.features.VmClientLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -33,15 +32,4 @@ public class BluelockVCloudZone01VmClientLiveTest extends VmClientLiveTest {
public BluelockVCloudZone01VmClientLiveTest() { public BluelockVCloudZone01VmClientLiveTest() {
provider = "bluelock-vcloud-zone01"; provider = "bluelock-vcloud-zone01";
} }
@Override
protected void checkApiOutput(String apiOutput) {
checkApiOutput1_0_0(apiOutput);
}
@Override
protected void checkCustomizationOccurred(ExecResponse exec) {
// for some reason
assert exec.getOutput().equals("") : exec;
}
} }