Repository: stratos Updated Branches: refs/heads/master 740f2ea0a -> 5bae29ec8
Fixing kubernetes live test issue in service creation assertion Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5bae29ec Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5bae29ec Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5bae29ec Branch: refs/heads/master Commit: 5bae29ec8ef66816900dbbafbc7fd6d85287b74b Parents: 740f2ea Author: Imesh Gunaratne <[email protected]> Authored: Thu Jan 29 17:43:48 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Jan 29 17:43:48 2015 +0530 ---------------------------------------------------------------------- components/org.apache.stratos.kubernetes.client/README.md | 4 ++-- .../kubernetes/client/live/KubernetesApiClientLiveTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5bae29ec/components/org.apache.stratos.kubernetes.client/README.md ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/README.md b/components/org.apache.stratos.kubernetes.client/README.md index 14e0167..61d69a5 100644 --- a/components/org.apache.stratos.kubernetes.client/README.md +++ b/components/org.apache.stratos.kubernetes.client/README.md @@ -6,7 +6,7 @@ Google Kubernetes Java Client component supports running live tests against a Ku Pre-requisites ============== -* Set up a Kubernetes Master node and make sure the API server is running. Please refer to Stratos documentation as to how you could build a setup. Say your Kubernetes API endpoint is ```http://192.168.1.100:8080/api/v1beta1/``` +* Set up a Kubernetes Master node and make sure the API server is running.Please refer to Stratos documentation as to how you could build a setup. Say your Kubernetes API endpoint is ```http://192.168.1.100:8080/api/v1beta1/``` * Please pull a preferred docker image into the Master node. Say your preferred docker image is ```gurpartap/redis```. How to run the tests @@ -18,7 +18,7 @@ How to run the tests ```cd components/org.apache.stratos.kubernetes.client``` * Run the live test profile; - ```mvn clean install -Plive -Dkubernetes.api.endpoint=http://192.168.1.100:8080/api/v1beta1/ -Ddocker.image=gurpartap/redis``` + ```mvn clean install -Plive -Dkubernetes.api.endpoint=http://192.168.1.100:8080/api/v1beta1/ -Ddocker.image=gurpartap/redis -dcontainer.port=8080``` NOTE: Please note that these are the default values and if your setup is equivalent to this, you can simply run ```mvn clean install -Plive``` http://git-wip-us.apache.org/repos/asf/stratos/blob/5bae29ec/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesApiClientLiveTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesApiClientLiveTest.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesApiClientLiveTest.java index c9bc4df..565cef6 100644 --- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesApiClientLiveTest.java +++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesApiClientLiveTest.java @@ -115,7 +115,7 @@ public class KubernetesApiClientLiveTest extends TestCase{ Thread.sleep(POD_ACTIVATION_WAIT_TIME); pod = client.getPod(podId); assertNotNull(pod); - assertEquals(pod.getCurrentState().getStatus(), KubernetesConstants.POD_STATUS_RUNNING); + assertEquals(KubernetesConstants.POD_STATUS_RUNNING, pod.getCurrentState().getStatus()); log.info("Pod state changed to running: " + pod.getId()); log.info("Deleting pod: " + pod.getId()); @@ -159,7 +159,7 @@ public class KubernetesApiClientLiveTest extends TestCase{ // Wait 5s for Pods to be created Thread.sleep(5000); ReplicationController replicationController = client.getReplicationController(replicationControllerId); - assertNull(replicationController); + assertNotNull(replicationController); log.info("Replication controller created successfully"); // Validate recreation using same id
