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/20 13:17:43 UTC
[2/3] stratos git commit: PCA - Adjustments in integration test
PCA - Adjustments in integration test
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/da990214
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/da990214
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/da990214
Branch: refs/heads/master
Commit: da99021487ebbc7329b901117060a8112172706b
Parents: 52ce945
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Sun Feb 15 04:19:02 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Feb 20 17:47:38 2015 +0530
----------------------------------------------------------------------
.../test/PythonCartridgeAgentTest.java | 55 +++++++++++---------
1 file changed, 29 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/da990214/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 27665f4..7c9bab2 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
@@ -76,6 +76,7 @@ public class PythonCartridgeAgentTest {
private boolean instanceActivated;
private ByteArrayOutputStreamLocal outputStream;
private ExecutorService executorService;
+ private boolean eventReceiverInitiated = false;
public PythonCartridgeAgentTest(ArtifactUpdatedEvent artifactUpdatedEvent, Boolean expectedResult) {
this.artifactUpdatedEvent = artifactUpdatedEvent;
@@ -93,39 +94,43 @@ public class PythonCartridgeAgentTest {
serverSocketList = new ArrayList<ServerSocket>();
executorList = new HashMap<String, Executor>();
- this.executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", 5);
- TopologyEventReceiver topologyEventReceiver = new TopologyEventReceiver();
- topologyEventReceiver.setExecutorService(executorService);
- topologyEventReceiver.execute();
+ if (!this.eventReceiverInitiated) {
+ this.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();
+ InstanceStatusEventReceiver instanceStatusEventReceiver = new InstanceStatusEventReceiver();
+ instanceStatusEventReceiver.setExecutorService(executorService);
+ instanceStatusEventReceiver.execute();
- this.instanceStarted = false;
- instanceStatusEventReceiver.addEventListener(new InstanceStartedEventListener() {
- @Override
- protected void onEvent(Event event) {
- log.info("Instance started event received");
- instanceStarted = true;
- }
- });
+ this.instanceStarted = false;
+ instanceStatusEventReceiver.addEventListener(new InstanceStartedEventListener() {
+ @Override
+ protected void onEvent(Event event) {
+ log.info("Instance started event received");
+ instanceStarted = true;
+ }
+ });
- this.instanceActivated = false;
- instanceStatusEventReceiver.addEventListener(new InstanceActivatedEventListener() {
- @Override
- protected void onEvent(Event event) {
- log.info("Instance activated event received");
- instanceActivated = true;
- }
- });
+ this.instanceActivated = false;
+ instanceStatusEventReceiver.addEventListener(new InstanceActivatedEventListener() {
+ @Override
+ protected void onEvent(Event event) {
+ log.info("Instance activated event received");
+ instanceActivated = true;
+ }
+ });
+
+ this.eventReceiverInitiated = true;
+ }
String agentPath = setupPythonAgent();
log.info("Starting python cartridge agent...");
this.outputStream = executeCommand("python " + agentPath + "/agent.py");
// Simulate CEP server socket
- // startServerSocket(7711);
+ startServerSocket(7711);
}
@After
@@ -162,8 +167,6 @@ public class PythonCartridgeAgentTest {
}
- this.executorService.shutdownNow();
-
this.instanceActivated = false;
this.instanceStarted = false;
}