Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1380 from jclouds/mock-bug-dynect 

address bug where expect-100 continue can hang things
This commit is contained in:
Adrian Cole 2013-03-02 08:36:40 -08:00
parent e16c7ba40c fc39b2b92b
commit 752bc5ea08
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
labs/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java
View File

@ -18,14 +18,22 @@
*/ */
package org.jclouds.dynect.v3; package org.jclouds.dynect.v3;
import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.Constants.PROPERTY_CONNECTION_TIMEOUT;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT;
import java.io.IOException; import java.io.IOException;
import java.util.Properties;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.dynect.v3.DynECTExceptions.TargetExistsException; import org.jclouds.dynect.v3.DynECTExceptions.TargetExistsException;
import org.jclouds.dynect.v3.DynECTExceptions.JobStillRunningException; import org.jclouds.dynect.v3.DynECTExceptions.JobStillRunningException;
import org.jclouds.rest.RestContext;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
import com.google.mockwebserver.MockResponse; import com.google.mockwebserver.MockResponse;
import com.google.mockwebserver.MockWebServer; import com.google.mockwebserver.MockWebServer;
@ -36,8 +44,18 @@ import com.google.mockwebserver.MockWebServer;
@Test(singleThreaded = true) @Test(singleThreaded = true)
public class DynectApiMockTest { public class DynectApiMockTest {
static RestContext<DynECTApi, DynECTAsyncApi> getContext(String uri) { static DynECTApi mockDynectApi(String uri) {
return ContextBuilder.newBuilder("dynect").credentials("jclouds:joe", "letmein").endpoint(uri).build(); Properties overrides = new Properties();
overrides.setProperty(PROPERTY_CONNECTION_TIMEOUT, "1000");
// prevent expect-100 bug http://code.google.com/p/mockwebserver/issues/detail?id=6
overrides.setProperty(PROPERTY_SO_TIMEOUT, "0");
overrides.setProperty(PROPERTY_MAX_RETRIES, "1");
return ContextBuilder.newBuilder("dynect")
.credentials("jclouds:joe", "letmein")
.endpoint(uri)
.overrides(overrides)
.modules(ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(), sameThreadExecutor())))
.build(DynECTApiMetadata.CONTEXT_TOKEN).getApi();
} }
String session = "{\"status\": \"success\", \"data\": {\"token\": \"FFFFFFFFFF\", \"version\": \"3.3.8\"}, \"job_id\": 254417252, \"msgs\": [{\"INFO\": \"login: Login successful\", \"SOURCE\": \"BLL\", \"ERR_CD\": null, \"LVL\": \"INFO\"}]}"; String session = "{\"status\": \"success\", \"data\": {\"token\": \"FFFFFFFFFF\", \"version\": \"3.3.8\"}, \"job_id\": 254417252, \"msgs\": [{\"INFO\": \"login: Login successful\", \"SOURCE\": \"BLL\", \"ERR_CD\": null, \"LVL\": \"INFO\"}]}";
@ -51,7 +69,7 @@ public class DynectApiMockTest {
server.enqueue(new MockResponse().setResponseCode(200).setBody(running)); server.enqueue(new MockResponse().setResponseCode(200).setBody(running));
server.play(); server.play();
DynECTApi api = getContext(server.getUrl("/").toString()).getApi(); DynECTApi api = mockDynectApi(server.getUrl("/").toString());
try { try {
api.getZoneApi().list(); api.getZoneApi().list();
@ -70,7 +88,7 @@ public class DynectApiMockTest {
server.enqueue(new MockResponse().setResponseCode(200).setBody(taskBlocking)); server.enqueue(new MockResponse().setResponseCode(200).setBody(taskBlocking));
server.play(); server.play();
DynECTApi api = getContext(server.getUrl("/").toString()).getApi(); DynECTApi api = mockDynectApi(server.getUrl("/").toString());
try { try {
api.getZoneApi().list(); api.getZoneApi().list();
@ -88,7 +106,7 @@ public class DynectApiMockTest {
server.enqueue(new MockResponse().setResponseCode(200).setBody(targetExists)); server.enqueue(new MockResponse().setResponseCode(200).setBody(targetExists));
server.play(); server.play();
DynECTApi api = getContext(server.getUrl("/").toString()).getApi(); DynECTApi api = mockDynectApi(server.getUrl("/").toString());
try { try {
api.getZoneApi().list(); api.getZoneApi().list();