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

Fixed cookbook upload tests

Browse Source 
There was an issue when commiting the sandbox after uploading its
contents. We were sending the is_complete flag as a String when the Chef
Server expected a boolean flag. Fixing the binder fixed the live test.
This commit is contained in:
Ignasi Barrera 2012-07-03 16:09:48 +02:00
parent 20912c9ad4
commit 85ce1bd659
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/chef/src/main/java/org/jclouds/chef/binders/BindIsCompletedToJsonPayload.java
View File

@ -34,7 +34,7 @@ public class BindIsCompletedToJsonPayload extends BindToStringPayload {
@Override
public <R extends HttpRequest> R bindToRequest(R request, Object payload ) {
super.bindToRequest(request, String.format("{\"is_completed\":\"%s\"}", payload));
super.bindToRequest(request, String.format("{\"is_completed\":%s}", payload));
request.getPayload().getContentMetadata().setContentType(MediaType.APPLICATION_JSON);
return request;
}

2
apis/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java
View File

@ -86,7 +86,7 @@ public class ChefAsyncClientTest extends BaseAsyncClientTest<ChefAsyncClient> {
assertRequestLineEquals(httpRequest,
"PUT http://localhost:4000/sandboxes/0189e76ccc476701d6b374e5a1a27347 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefAsyncClient.VERSION + "-test\n");
assertPayloadEquals(httpRequest, "{\"is_completed\":\"true\"}", "application/json", false);
assertPayloadEquals(httpRequest, "{\"is_completed\":true}", "application/json", false);
assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
assertSaxResponseParserClassEquals(method, null);

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

@ -130,11 +130,11 @@ public abstract class BaseChefClientLiveTest<C extends Context> extends BaseChef
}
// create a new cookbook
CookbookVersion cookbook = new CookbookVersion("test3", "0.0.0");
CookbookVersion cookbook = new CookbookVersion(PREFIX, "0.0.0");
cookbook.getRootFiles().add(new Resource(content));
// upload the cookbook to the remote server
chefClient.updateCookbook("test3", "0.0.0", cookbook);
chefClient.updateCookbook(PREFIX, "0.0.0", cookbook);
}
@Test(dependsOnMethods = "testCreateClient")
@ -168,22 +168,13 @@ public abstract class BaseChefClientLiveTest<C extends Context> extends BaseChef
@Test(dependsOnMethods = "testCreateNewCookbook")
public void testUpdateCookbook() throws Exception {
for (String cookbook : chefClient.listCookbooks())
for (String version : chefClient.getVersionsOfCookbook(cookbook)) {
CookbookVersion cook = chefClient.getCookbook(cookbook, version);
chefClient.updateCookbook(cookbook, version, cook);
}
CookbookVersion cookbook = chefClient.getCookbook(PREFIX, "0.0.0");
assertNotNull(chefClient.updateCookbook(PREFIX, "0.0.0", cookbook));
}
@Test(dependsOnMethods = {"testCreateNewCookbook", "testUpdateCookbook"}, enabled = false)
public void testCreateCookbook() throws Exception {
for (String cookbook : chefClient.listCookbooks())
for (String version : chefClient.getVersionsOfCookbook(cookbook)) {
CookbookVersion cook = chefClient.getCookbook(cookbook, version);
chefClient.deleteCookbook(cookbook, version);
assert chefClient.getCookbook(cookbook, version) == null : cookbook + version;
chefClient.updateCookbook(cookbook, version, cook);
}
@Test(dependsOnMethods = {"testCreateNewCookbook", "testUpdateCookbook"})
public void testDeleteCookbook() throws Exception {
assertNotNull(chefClient.deleteCookbook(PREFIX, "0.0.0"));
}
@Test(expectedExceptions = AuthorizationException.class)