You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2015/09/24 04:37:26 UTC
[07/50] [abbrv] incubator-apex-core git commit: APEX-100 #resolve
make embeddedwebsocketserver use an automatically selected port instead of
hardcoded port
APEX-100 #resolve make embeddedwebsocketserver use an automatically selected port instead of hardcoded port
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/7888aa24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/7888aa24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/7888aa24
Branch: refs/heads/feature-module
Commit: 7888aa244b71f121f064800c64a2e823dff35f34
Parents: 065ddbe
Author: David Yan <da...@datatorrent.com>
Authored: Wed Sep 9 17:18:22 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Wed Sep 9 17:18:22 2015 -0700
----------------------------------------------------------------------
.../datatorrent/stram/StreamingContainerManagerTest.java | 4 ++--
.../com/datatorrent/stram/support/StramTestSupport.java | 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/7888aa24/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java b/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
index 2656e8d..daa9e13 100644
--- a/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
@@ -901,10 +901,9 @@ public class StreamingContainerManagerTest
@Test
public void testAppDataPush() throws Exception
{
- int port = 12345;
final String topic = "xyz";
final List<JSONObject> messages = new ArrayList<JSONObject>();
- EmbeddedWebSocketServer server = new EmbeddedWebSocketServer(port);
+ EmbeddedWebSocketServer server = new EmbeddedWebSocketServer(0);
server.setWebSocket(new WebSocket.OnTextMessage()
{
@@ -930,6 +929,7 @@ public class StreamingContainerManagerTest
});
try {
server.start();
+ int port = server.getPort();
LogicalPlan dag = new LogicalPlan();
dag.setAttribute(Context.OperatorContext.STORAGE_AGENT, new AsyncFSStorageAgent(testMeta.dir, null));
TestGeneratorInputOperator o1 = dag.addOperator("o1", TestGeneratorInputOperator.class);
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/7888aa24/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java b/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java
index 71a402e..efd44ba 100644
--- a/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java
+++ b/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java
@@ -533,7 +533,7 @@ abstract public class StramTestSupport
private final Logger LOG = LoggerFactory.getLogger(EmbeddedWebSocketServer.class);
- private final int port;
+ private int port;
private Server server;
private WebSocket websocket;
@@ -570,6 +570,14 @@ abstract public class StramTestSupport
contextHandler.addServlet(new ServletHolder(webSocketServlet), "/pubsub");
server.start();
+ if (port == 0) {
+ port = server.getConnectors()[0].getLocalPort();
+ }
+ }
+
+ public int getPort()
+ {
+ return port;
}
public void stop() throws Exception