You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/03/25 19:29:45 UTC
[1/2] incubator-quarks git commit: [QUARKS-86] Desensitize
WebSocketClientTest.testSslReconnect
Repository: incubator-quarks
Updated Branches:
refs/heads/master fff04b1d8 -> b3ca7ee93
[QUARKS-86] Desensitize WebSocketClientTest.testSslReconnect
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/a70d369d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/a70d369d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/a70d369d
Branch: refs/heads/master
Commit: a70d369d28a7bfea179f861a1d8f3bb480e2ea8d
Parents: 2f9cbe9
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Mar 25 14:16:19 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Mar 25 14:16:19 2016 -0400
----------------------------------------------------------------------
.../wsclient/javax/websocket/WebSocketClientTest.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/a70d369d/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
----------------------------------------------------------------------
diff --git a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
index 6da1014..aa9167b 100644
--- a/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
+++ b/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
@@ -492,20 +492,23 @@ public class WebSocketClientTest extends ConnectorTestBase {
s = PlumbingStreams.blockingOneShotDelay(s, 2, TimeUnit.SECONDS);
// send one, two, restart the server to force reconnect, send the next
- AtomicInteger cnt = new AtomicInteger();
+ AtomicInteger numSent = new AtomicInteger();
+ int restartAfterTupleCnt = 2;
+ CountDownLatch latch = new CountDownLatch(restartAfterTupleCnt);
s = s.filter(tuple -> {
- if (cnt.getAndIncrement() != 2)
+ if (numSent.getAndIncrement() != restartAfterTupleCnt )
return true;
else {
- // delay so we rcv the prior echo'd tuple
- try { Thread.sleep(2000); } catch (Exception e) {};
+ // to keep validation sane/simple wait till the tuples are rcvd before restarting
+ try { latch.await(); } catch (Exception e) {};
restartEchoer(2/*secDelay*/);
return true;
}
});
wsClient.sendString(s);
- TStream<String> rcvd = wsClient.receiveString();
+ TStream<String> rcvd = wsClient.receiveString()
+ .peek(tuple -> latch.countDown());
completeAndValidate("", t, rcvd, SEC_TMO + 10, expected);
}
[2/2] incubator-quarks git commit: Merge pull request #47
Posted by dl...@apache.org.
Merge pull request #47
This closes #47
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/b3ca7ee9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/b3ca7ee9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/b3ca7ee9
Branch: refs/heads/master
Commit: b3ca7ee93aafa3ac35c8ad4d615a8cd68a783c85
Parents: fff04b1 a70d369
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Mar 25 14:29:38 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Mar 25 14:29:38 2016 -0400
----------------------------------------------------------------------
.../wsclient/javax/websocket/WebSocketClientTest.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3ca7ee9/connectors/wsclient-javax.websocket/src/test/java/quarks/tests/connectors/wsclient/javax/websocket/WebSocketClientTest.java
----------------------------------------------------------------------