You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/02/13 06:56:37 UTC
[2/3] stratos git commit: Adding instance status event listener in
python cartridge agent test
Adding instance status event listener in python cartridge agent test
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f3a1f79f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f3a1f79f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f3a1f79f
Branch: refs/heads/master
Commit: f3a1f79f459e3771c471c8d48a41dc766dbcf519
Parents: 6e5909b
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Feb 13 10:16:44 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Feb 13 10:16:54 2015 +0530
----------------------------------------------------------------------
.../test/PythonCartridgeAgentTest.java | 38 +++++++++++++++++---
1 file changed, 34 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3a1f79f/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java b/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java
index 623719c..ebafbcf 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java
+++ b/components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java
@@ -32,6 +32,9 @@ import org.apache.stratos.messaging.event.Event;
import org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent;
import org.apache.stratos.messaging.event.topology.CompleteTopologyEvent;
import org.apache.stratos.messaging.event.topology.MemberInitializedEvent;
+import org.apache.stratos.messaging.listener.instance.status.InstanceActivatedEventListener;
+import org.apache.stratos.messaging.listener.instance.status.InstanceStartedEventListener;
+import org.apache.stratos.messaging.message.receiver.instance.status.InstanceStatusEventReceiver;
import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver;
import org.apache.stratos.messaging.util.MessagingUtil;
import org.junit.AfterClass;
@@ -90,14 +93,35 @@ public class PythonCartridgeAgentTest {
return StringUtils.removeEnd(path, File.separator);
}
- @Test(timeout = 300000)
+ @Test(timeout = 200000)
public void testPythonCartridgeAgent() {
- ExecutorService executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", 1);
+ ExecutorService executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", 5);
TopologyEventReceiver topologyEventReceiver = new TopologyEventReceiver();
topologyEventReceiver.setExecutorService(executorService);
topologyEventReceiver.execute();
+ InstanceStatusEventReceiver instanceStatusEventReceiver = new InstanceStatusEventReceiver();
+ instanceStatusEventReceiver.setExecutorService(executorService);
+ instanceStatusEventReceiver.execute();
+
+ final boolean[] instanceStarted = new boolean[1];
+ instanceStatusEventReceiver.addEventListener(new InstanceStartedEventListener() {
+ @Override
+ protected void onEvent(Event event) {
+ instanceStarted[0] = true;
+ }
+ });
+
+
+ final boolean[] instanceActivated = new boolean[1];
+ instanceStatusEventReceiver.addEventListener(new InstanceActivatedEventListener() {
+ @Override
+ protected void onEvent(Event event) {
+ instanceActivated[0] = true;
+ }
+ });
+
// Simulate CEP server socket
startServerSocket(7711);
@@ -146,14 +170,20 @@ public class PythonCartridgeAgentTest {
}
if(line.contains("Git clone operation for tenant u'" + TENANT_ID + "' successful")) {
- assertTrue(true);
- return;
+ break;
+ }
+
+ if(instanceActivated[0]) {
+ break;
}
log.info(line);
}
}
sleep(500);
}
+
+ assertTrue("Instance started event was not received", instanceStarted[0]);
+ assertTrue("Instance activated event was not received", instanceActivated[0]);
}
private void publishEvent(Event event) {