Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-07 10:39:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not force the Chef server version

Browse Source
This commit is contained in:
Ignasi Barrera 2012-07-02 14:08:40 +02:00
parent b4b7f5623a
commit 05481efd71
5 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/chef/pom.xml
View File

@ -38,8 +38,8 @@
<test.chef.endpoint>http://localhost:4000</test.chef.endpoint> <test.chef.endpoint>http://localhost:4000</test.chef.endpoint>
<test.chef.api-version></test.chef.api-version> <test.chef.api-version></test.chef.api-version>
<test.chef.build-version></test.chef.build-version> <test.chef.build-version></test.chef.build-version>
<test.chef.identity>chef-validator</test.chef.identity> <test.chef.identity>chef-webui</test.chef.identity>
<test.chef.credential>${user.home}/.chef/validation.pem</test.chef.credential> <test.chef.credential>${user.home}/.chef/webui.pem</test.chef.credential>
<test.chef.validator.identity>chef-validator</test.chef.validator.identity> <test.chef.validator.identity>chef-validator</test.chef.validator.identity>
<test.chef.validator.credential>${user.home}/.chef/validation.pem</test.chef.validator.credential> <test.chef.validator.credential>${user.home}/.chef/validation.pem</test.chef.validator.credential>
<jclouds.osgi.import> <jclouds.osgi.import>

9
apis/chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.chef; package org.jclouds.chef;
import java.util.Properties;
import org.jclouds.Constants;
import org.jclouds.chef.internal.BaseChefClientLiveTest; import org.jclouds.chef.internal.BaseChefClientLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -32,11 +29,5 @@ import org.testng.annotations.Test;
@Test(groups = { "live" }) @Test(groups = { "live" })
public class ChefClientLiveTest extends BaseChefClientLiveTest { public class ChefClientLiveTest extends BaseChefClientLiveTest {
@Override
protected Properties setupProperties() {
Properties props = super.setupProperties();
props.setProperty(Constants.PROPERTY_API_VERSION, ChefAsyncClient.VERSION);
return props;
}
} }

1
apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefClientLiveTest.java
View File

@ -54,7 +54,6 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.io.Closeables; import com.google.common.io.Closeables;
import com.google.common.primitives.Bytes; import com.google.common.primitives.Bytes;
/** /**

1
apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefContextLiveTest.java
View File

@ -22,7 +22,6 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Properties; import java.util.Properties;
import org.jclouds.Constants;
import org.jclouds.apis.BaseContextLiveTest; import org.jclouds.apis.BaseContextLiveTest;
import org.jclouds.chef.ChefContext; import org.jclouds.chef.ChefContext;
import org.testng.annotations.Test; import org.testng.annotations.Test;

3
apis/chef/src/test/java/org/jclouds/ohai/functions/ByteArrayToMacAddressTest.java
View File

@ -20,10 +20,7 @@ package org.jclouds.ohai.functions;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import java.io.IOException;
import org.jclouds.crypto.CryptoStreams; import org.jclouds.crypto.CryptoStreams;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**