This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d9f0e7f Configure cluster tests to use localhost.
d9f0e7f is described below
commit d9f0e7f9467a88e53cd92443df3d2136fd1c22c7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Nov 6 16:44:29 2021 +0000
Configure cluster tests to use localhost.
These tests are failing on ci2.a.o - hopefully this will fix it.
---
.../apache/catalina/tribes/group/TestGroupChannelMemberArrival.java | 2 ++
.../catalina/tribes/group/TestGroupChannelSenderConnections.java | 2 ++
test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java | 1 +
.../catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java | 2 ++
.../catalina/tribes/group/interceptors/TestOrderInterceptor.java | 3 ++-
.../catalina/tribes/group/interceptors/TestTcpFailureDetector.java | 3 +++
6 files changed, 12 insertions(+), 1 deletion(-)
diff --git
a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
index 8d8dba1..495b020 100644
--- a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
+++ b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
@@ -28,6 +28,7 @@ import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
import org.apache.catalina.tribes.TesterUtil;
+import org.apache.catalina.tribes.transport.ReceiverBase;
public class TestGroupChannelMemberArrival {
private static int count = 10;
@@ -38,6 +39,7 @@ public class TestGroupChannelMemberArrival {
public void setUp() throws Exception {
for (int i = 0; i < channels.length; i++) {
channels[i] = new GroupChannel();
+ ((ReceiverBase)
channels[i].getChannelReceiver()).setHost("localhost");
channels[i].getMembershipService().setPayload( ("Channel-" + (i +
1)).getBytes("ASCII"));
listeners[i] = new TestMbrListener( ("Listener-" + (i + 1)));
channels[i].addMembershipListener(listeners[i]);
diff --git
a/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
b/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
index 61941b4..62fc35f 100644
---
a/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
+++
b/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
@@ -33,6 +33,7 @@ import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.TesterUtil;
+import org.apache.catalina.tribes.transport.ReceiverBase;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
public class TestGroupChannelSenderConnections extends LoggingBaseTest {
@@ -46,6 +47,7 @@ public class TestGroupChannelSenderConnections extends
LoggingBaseTest {
super.setUp();
for (int i = 0; i < channels.length; i++) {
channels[i] = new GroupChannel();
+ ((ReceiverBase)
channels[i].getChannelReceiver()).setHost("localhost");
channels[i].getMembershipService().setPayload( ("Channel-" + (i +
1)).getBytes("ASCII"));
listeners[i] = new TestMsgListener( ("Listener-" + (i + 1)));
channels[i].addChannelListener(listeners[i]);
diff --git
a/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
b/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
index 19f825e..7fc63e7 100644
--- a/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
+++ b/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
@@ -34,6 +34,7 @@ public class TestGroupChannelStartStop {
@Before
public void setUp() throws Exception {
channel = new GroupChannel();
+ ((ReceiverBase) channel.getChannelReceiver()).setHost("localhost");
}
@After
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index f196a7a..1ad80db 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -28,6 +28,7 @@ import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.TesterUtil;
import org.apache.catalina.tribes.group.GroupChannel;
+import org.apache.catalina.tribes.transport.ReceiverBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -51,6 +52,7 @@ public class TestNonBlockingCoordinator {
Thread[] threads = new Thread[CHANNEL_COUNT];
for ( int i=0; i<CHANNEL_COUNT; i++ ) {
channels[i] = new GroupChannel();
+ ((ReceiverBase)
channels[i].getChannelReceiver()).setHost("localhost");
coordinators[i] = new NonBlockingCoordinator();
channels[i].addInterceptor(coordinators[i]);
TcpFailureDetector tcpFailureDetector = new
TcpFailureDetector();
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
b/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
index 501ee68..824a4ce 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
@@ -35,6 +35,7 @@ import org.apache.catalina.tribes.TesterUtil;
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.group.InterceptorPayload;
+import org.apache.catalina.tribes.transport.ReceiverBase;
public class TestOrderInterceptor {
@@ -55,7 +56,7 @@ public class TestOrderInterceptor {
threads = new Thread[channelCount];
for ( int i=0; i<channelCount; i++ ) {
channels[i] = new GroupChannel();
-
+ ((ReceiverBase)
channels[i].getChannelReceiver()).setHost("localhost");
orderitcs[i] = new OrderInterceptor();
mangleitcs[i] = new MangleOrderInterceptor();
orderitcs[i].setExpire(Long.MAX_VALUE);
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
b/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
index 93d3e96..fb08670 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
@@ -31,6 +31,7 @@ import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
import org.apache.catalina.tribes.TesterUtil;
import org.apache.catalina.tribes.group.GroupChannel;
+import org.apache.catalina.tribes.transport.ReceiverBase;
public class TestTcpFailureDetector {
private TcpFailureDetector tcpFailureDetector1 = null;
@@ -44,6 +45,8 @@ public class TestTcpFailureDetector {
public void setUp() throws Exception {
channel1 = new GroupChannel();
channel2 = new GroupChannel();
+ ((ReceiverBase) channel1.getChannelReceiver()).setHost("localhost");
+ ((ReceiverBase) channel2.getChannelReceiver()).setHost("localhost");
channel1.getMembershipService().setPayload("Channel-1".getBytes("ASCII"));
channel2.getMembershipService().setPayload("Channel-2".getBytes("ASCII"));
mbrlist1 = new TestMbrListener("Channel-1");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
