This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new ea72903 Fix Camel-kubernetes lock test
ea72903 is described below
commit ea72903d404a976002c3ba0234af7ee0cc04c795
Author: nferraro <[email protected]>
AuthorDate: Tue Sep 17 18:58:31 2019 +0200
Fix Camel-kubernetes lock test
---
.../kubernetes/cluster/utils/LockTestServer.java | 82 +++++++++++-----------
.../cluster/utils/LockTestServerTest.java | 2 -
2 files changed, 41 insertions(+), 43 deletions(-)
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
index cd83fa8..581b2a9 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
@@ -58,31 +58,30 @@ public class LockTestServer extends KubernetesMockServer {
this.pods = new TreeSet<>(initialPods);
expect().get().withPath("/api/v1/namespaces/test/configmaps/" +
lockSimulator.getConfigMapName()).andReply(new ResponseProvider<Object>() {
- ThreadLocal<Integer> responseCode = ThreadLocal.withInitial(() ->
1);
private Headers headers = new Headers.Builder().build();
@Override
public int getStatusCode(RecordedRequest request) {
- return responseCode.get();
+ if (refuseRequests) {
+ return 500;
+ }
+
+ if (lockSimulator.getConfigMap() != null) {
+ return 200;
+ }
+
+ return 404;
}
@Override
public Object getBody(RecordedRequest recordedRequest) {
delayIfNecessary();
- if (refuseRequests) {
- responseCode.set(500);
- return "";
- }
-
ConfigMap map = lockSimulator.getConfigMap();
if (map != null) {
- responseCode.set(200);
return map;
- } else {
- responseCode.set(404);
- return "";
}
+ return "";
}
@Override
@@ -97,36 +96,37 @@ public class LockTestServer extends KubernetesMockServer {
}).always();
expect().post().withPath("/api/v1/namespaces/test/configmaps").andReply(new
ResponseProvider<Object>() {
- ThreadLocal<Integer> responseCode = ThreadLocal.withInitial(() ->
1);
private Headers headers = new Headers.Builder().build();
@Override
public int getStatusCode(RecordedRequest request) {
- return responseCode.get();
- }
-
- @Override
- public Object getBody(RecordedRequest recordedRequest) {
- delayIfNecessary();
if (refuseRequests) {
- responseCode.set(500);
- return "";
+ return 500;
}
- ConfigMap map = convert(recordedRequest);
+ ConfigMap map = convert(request);
if (map == null || map.getMetadata() == null ||
!lockSimulator.getConfigMapName().equals(map.getMetadata().getName())) {
throw new IllegalArgumentException("Illegal configMap
received");
}
boolean done = lockSimulator.setConfigMap(map, true);
if (done) {
- responseCode.set(201);
- return lockSimulator.getConfigMap();
- } else {
- responseCode.set(500);
- return "";
+ return 201;
}
+ return 500;
+ }
+
+ @Override
+ public Object getBody(RecordedRequest recordedRequest) {
+ delayIfNecessary();
+
+ ConfigMap map = lockSimulator.getConfigMap();
+ if (map != null) {
+ return map;
+ }
+
+ return "";
}
@Override
@@ -141,33 +141,33 @@ public class LockTestServer extends KubernetesMockServer {
}).always();
expect().put().withPath("/api/v1/namespaces/test/configmaps/" +
lockSimulator.getConfigMapName()).andReply(new ResponseProvider<Object>() {
- ThreadLocal<Integer> responseCode = ThreadLocal.withInitial(() ->
1);
private Headers headers = new Headers.Builder().build();
@Override
public int getStatusCode(RecordedRequest request) {
- return responseCode.get();
- }
-
- @Override
- public Object getBody(RecordedRequest recordedRequest) {
- delayIfNecessary();
if (refuseRequests) {
- responseCode.set(500);
- return "";
+ return 500;
}
- ConfigMap map = convert(recordedRequest);
+ ConfigMap map = convert(request);
boolean done = lockSimulator.setConfigMap(map, false);
if (done) {
- responseCode.set(200);
- return lockSimulator.getConfigMap();
- } else {
- responseCode.set(409);
- return "";
+ return 200;
}
+ return 409;
+ }
+
+ @Override
+ public Object getBody(RecordedRequest recordedRequest) {
+ delayIfNecessary();
+ ConfigMap map = lockSimulator.getConfigMap();
+ if (map != null) {
+ return map;
+ }
+
+ return "";
}
@Override
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java
index 64e3d16..713aa67 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java
@@ -21,7 +21,6 @@ import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -30,7 +29,6 @@ import static org.junit.Assert.assertNull;
/**
* Basic tests on the lock test server.
*/
-@Ignore
public class LockTestServerTest {
@Test
