From 8bbaf45c03384b20138e95f58c98deefd03cbbe8 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Fri, 16 Mar 2012 00:45:32 -0700 Subject: [PATCH] test updates now that bluelock is no longer 1.0.0 --- .../BluelockVCloudZone01TemplateBuilderLiveTest.java | 4 ++++ .../BluelockVCloudZone01VmClientLiveTest.java | 12 ------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01TemplateBuilderLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01TemplateBuilderLiveTest.java index 5b6c416123..f53ad7a320 100644 --- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01TemplateBuilderLiveTest.java +++ b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/compute/BluelockVCloudZone01TemplateBuilderLiveTest.java @@ -53,6 +53,10 @@ public class BluelockVCloudZone01TemplateBuilderLiveTest extends BaseTemplateBui switch (input.family) { case UBUNTU: return !input.version.equals("") || !input.is64Bit; + case RHEL: + return !input.version.equals(""); + case WINDOWS: + return !input.version.equals(""); default: return true; } diff --git a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VmClientLiveTest.java b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VmClientLiveTest.java index 9a28b60f9a..247eb4f2b4 100644 --- a/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VmClientLiveTest.java +++ b/providers/bluelock-vcloud-zone01/src/test/java/org/jclouds/bluelock/vcloud/zone01/features/BluelockVCloudZone01VmClientLiveTest.java @@ -18,7 +18,6 @@ */ package org.jclouds.bluelock.vcloud.zone01.features; -import org.jclouds.compute.domain.ExecResponse; import org.jclouds.vcloud.features.VmClientLiveTest; import org.testng.annotations.Test; @@ -33,15 +32,4 @@ public class BluelockVCloudZone01VmClientLiveTest extends VmClientLiveTest { public BluelockVCloudZone01VmClientLiveTest() { 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; - } }