You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/11/19 08:23:51 UTC
jclouds-labs git commit: JCLOUDS-778: Removing OS support live tests
Repository: jclouds-labs
Updated Branches:
refs/heads/master 775b89fdb -> 3bceb3f4e
JCLOUDS-778: Removing OS support live tests
Follow-up to 278a73 in jclouds/jclouds
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/3bceb3f4
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/3bceb3f4
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/3bceb3f4
Branch: refs/heads/master
Commit: 3bceb3f4ef72d7b795da07f74c8b1906720f53f8
Parents: 775b89f
Author: Andrew Phillips <an...@apache.org>
Authored: Wed Nov 19 01:56:09 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Wed Nov 19 02:23:00 2014 -0500
----------------------------------------------------------------------
.../JoyentCloudTemplateBuilderLiveTest.java | 26 --------------------
1 file changed, 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3bceb3f4/joyentcloud/src/test/java/org/jclouds/joyent/joyentcloud/JoyentCloudTemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/joyentcloud/src/test/java/org/jclouds/joyent/joyentcloud/JoyentCloudTemplateBuilderLiveTest.java b/joyentcloud/src/test/java/org/jclouds/joyent/joyentcloud/JoyentCloudTemplateBuilderLiveTest.java
index bd78986..96faf11 100644
--- a/joyentcloud/src/test/java/org/jclouds/joyent/joyentcloud/JoyentCloudTemplateBuilderLiveTest.java
+++ b/joyentcloud/src/test/java/org/jclouds/joyent/joyentcloud/JoyentCloudTemplateBuilderLiveTest.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.joyent.joyentcloud;
-import static com.google.common.base.Predicates.not;
import static org.jclouds.compute.domain.OsFamily.SMARTOS;
import static org.jclouds.compute.domain.OsFamily.UBUNTU;
import static org.testng.Assert.assertEquals;
@@ -24,12 +23,10 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.util.Set;
-import org.jclouds.compute.domain.OsFamilyVersion64Bit;
import org.jclouds.compute.domain.Template;
import org.jclouds.compute.internal.BaseTemplateBuilderLiveTest;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableSet;
@Test(groups = "live", singleThreaded = true, testName = "JoyentCloudTemplateBuilderLiveTest")
@@ -39,29 +36,6 @@ public class JoyentCloudTemplateBuilderLiveTest extends BaseTemplateBuilderLiveT
provider = "joyentcloud";
}
- @Override
- protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() {
- return not(new Predicate<OsFamilyVersion64Bit>() {
-
- @Override
- public boolean apply(OsFamilyVersion64Bit input) {
- switch (input.family) {
- case UBUNTU:
- return (input.version.equals("") || input.version.equals("10.04") || input.version.equals("12.04"))
- && input.is64Bit;
- case DEBIAN:
- return input.is64Bit && !input.version.equals("5.0");
- case CENTOS:
- return (input.version.equals("") || input.version.equals("5.7") || input.version.equals("6.0"))
- && input.is64Bit;
- default:
- return false;
- }
- }
-
- });
- }
-
@Test
public void testTemplateBuilderSmartOS() throws IOException {
Template smartTemplate = view.getComputeService().templateBuilder().osFamily(SMARTOS).build();