Repository: oozie Updated Branches: refs/heads/master 6257e2066 -> 0473b9613
OOZIE-3289 TestJMSAccessorService#testConnectionRetry is still flaky (pbacsko via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/0473b961 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/0473b961 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/0473b961 Branch: refs/heads/master Commit: 0473b96139f71e3ab9cb7bf0fcb5d8e2535922da Parents: 6257e20 Author: Andras Piros <[email protected]> Authored: Tue Jun 19 15:57:25 2018 +0200 Committer: Andras Piros <[email protected]> Committed: Tue Jun 19 15:57:25 2018 +0200 ---------------------------------------------------------------------- .../oozie/service/TestJMSAccessorService.java | 18 ++++++++++++++---- release-log.txt | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/0473b961/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java b/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java index e21a01d..a10ffc9 100644 --- a/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java +++ b/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java @@ -161,7 +161,9 @@ public class TestJMSAccessorService extends XTestCase { waitFor(JMS_TIMEOUT_MS, new Predicate() { @Override public boolean evaluate() throws Exception { - return jmsService.isListeningToTopic(connInfo, topic); + return jmsService.isListeningToTopic(connInfo, topic) + && !jmsService.isConnectionInRetryList(connInfo) + && !jmsService.isTopicInRetryList(connInfo, topic); } }); assertTrue(jmsService.isListeningToTopic(connInfo, topic)); @@ -214,7 +216,9 @@ public class TestJMSAccessorService extends XTestCase { waitFor(JMS_TIMEOUT_MS, new Predicate() { @Override public boolean evaluate() throws Exception { - return !jmsService.isListeningToTopic(connInfo, topic); + return !jmsService.isListeningToTopic(connInfo, topic) + && jmsService.isConnectionInRetryList(connInfo) + && jmsService.isTopicInRetryList(connInfo, topic); } }); assertFalse(jmsService.isListeningToTopic(connInfo, topic)); @@ -230,7 +234,9 @@ public class TestJMSAccessorService extends XTestCase { waitFor(JMS_TIMEOUT_MS, new Predicate() { @Override public boolean evaluate() throws Exception { - return jmsService.isListeningToTopic(connInfo, topic); + return jmsService.isListeningToTopic(connInfo, topic) + && !jmsService.isConnectionInRetryList(connInfo) + && !jmsService.isTopicInRetryList(connInfo, topic); } }); assertTrue(jmsService.isListeningToTopic(connInfo, topic)); @@ -270,7 +276,11 @@ public class TestJMSAccessorService extends XTestCase { waitFor(JMS_TIMEOUT_MS, new Predicate() { @Override public boolean evaluate() throws Exception { - return jmsService.getNumConnectionAttempts(connInfo) == 1; + return jmsService.getNumConnectionAttempts(connInfo) == 1 + && jmsService.isConnectionInRetryList(connInfo) + && jmsService.isTopicInRetryList(connInfo, topic) + && !jmsService.isListeningToTopic(connInfo, topic) + && !jmsService.retryConnection(connInfo); } }); http://git-wip-us.apache.org/repos/asf/oozie/blob/0473b961/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 0e3fdfd..af9f4a6 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3289 TestJMSAccessorService#testConnectionRetry is still flaky (pbacsko via andras.piros) OOZIE-3270 Upgrade Derby to 10.14.1.0 (gezapeti) OOZIE-3275 [docs] Update AG_Install.twiki with Access Control List documentation (andras.piros) OOZIE-2339 [fluent-job] Minimum Viable Fluent Job API (daniel.becker, andras.piros via rkanter, gezapeti, pbacsko)
