From 05481efd715414529eba8bf6bb392fe18d063e5a Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <ignasi.barrera@abiquo.com>
Date: Mon, 2 Jul 2012 14:08:40 +0200
Subject: [PATCH] Do not force the Chef server version

---
 apis/chef/pom.xml                                        | 4 ++--
 .../test/java/org/jclouds/chef/ChefClientLiveTest.java   | 9 ---------
 .../jclouds/chef/internal/BaseChefClientLiveTest.java    | 1 -
 .../jclouds/chef/internal/BaseChefContextLiveTest.java   | 1 -
 .../ohai/functions/ByteArrayToMacAddressTest.java        | 3 ---
 5 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/apis/chef/pom.xml b/apis/chef/pom.xml
index 40732b9a25..0b6ac83859 100644
--- a/apis/chef/pom.xml
+++ b/apis/chef/pom.xml
@@ -38,8 +38,8 @@
         <test.chef.endpoint>http://localhost:4000</test.chef.endpoint>
         <test.chef.api-version></test.chef.api-version>
         <test.chef.build-version></test.chef.build-version>
-        <test.chef.identity>chef-validator</test.chef.identity>
-        <test.chef.credential>${user.home}/.chef/validation.pem</test.chef.credential>
+        <test.chef.identity>chef-webui</test.chef.identity>
+        <test.chef.credential>${user.home}/.chef/webui.pem</test.chef.credential>
         <test.chef.validator.identity>chef-validator</test.chef.validator.identity>
         <test.chef.validator.credential>${user.home}/.chef/validation.pem</test.chef.validator.credential>
         <jclouds.osgi.import>
diff --git a/apis/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java
index a7b3165ac1..adc6e42bef 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java
@@ -18,9 +18,6 @@
  */
 package org.jclouds.chef;
 
-import java.util.Properties;
-
-import org.jclouds.Constants;
 import org.jclouds.chef.internal.BaseChefClientLiveTest;
 import org.testng.annotations.Test;
 
@@ -32,11 +29,5 @@ import org.testng.annotations.Test;
 @Test(groups = { "live" })
 public class ChefClientLiveTest extends BaseChefClientLiveTest {
     
-    @Override
-    protected Properties setupProperties() {
-        Properties props = super.setupProperties();
-        props.setProperty(Constants.PROPERTY_API_VERSION, ChefAsyncClient.VERSION);
-        return props;
-    }
     
 }
diff --git a/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefClientLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefClientLiveTest.java
index db8ac5e0ea..685061f292 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefClientLiveTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefClientLiveTest.java
@@ -54,7 +54,6 @@ import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
 import com.google.common.io.Closeables;
 import com.google.common.primitives.Bytes;
 /**
diff --git a/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefContextLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefContextLiveTest.java
index d241ae1114..c97e6805e8 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefContextLiveTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefContextLiveTest.java
@@ -22,7 +22,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Properties;
 
-import org.jclouds.Constants;
 import org.jclouds.apis.BaseContextLiveTest;
 import org.jclouds.chef.ChefContext;
 import org.testng.annotations.Test;
diff --git a/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java b/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java
index c9dc0474b1..88259038ba 100644
--- a/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java
+++ b/apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java
@@ -20,10 +20,7 @@ package org.jclouds.ohai.functions;
 
 import static org.testng.Assert.assertEquals;
 
-import java.io.IOException;
-
 import org.jclouds.crypto.CryptoStreams;
-import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 /**