This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new c21a35b Attempt to address intermittent CI failures
c21a35b is described below
commit c21a35b9313a67bbf4914bbf9919690c07ee94d9
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Apr 14 20:19:20 2020 +0100
Attempt to address intermittent CI failures
---
.../tribes/group/interceptors/TestTcpFailureDetector.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
b/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
index 17e28e8..ccca9ad 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
@@ -83,7 +83,16 @@ public class TestTcpFailureDetector {
channel2.stop(Channel.SND_RX_SEQ);
ByteMessage msg = new ByteMessage(new byte[1024]);
try {
- channel1.send(channel1.getMembers(), msg, 0);
+ int msgCount = 0;
+ // Normally the first message sent should fail but occasional
+ // failures are observed on CI systems so messages are sent in a
+ // loop with a delay between them to try and account for timing
+ // differences.
+ while (msgCount < 5) {
+ channel1.send(channel1.getMembers(), msg, 0);
+ msgCount++;
+ Thread.sleep(500);
+ }
Assert.fail("Message send should have failed.");
} catch ( ChannelException x ) {
// Ignore
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
