Skip to content

Commit a9b596d

Browse files
committed
Adapt test assertions for CI
Make them less multi-threaded, CI workers may not have much parallelism.
1 parent 4979145 commit a9b596d

File tree

1 file changed

+16
-25
lines changed

1 file changed

+16
-25
lines changed

src/test/java/com/rabbitmq/client/amqp/impl/RecoveryClusterTest.java

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -105,37 +105,28 @@ void clusterRestart() {
105105

106106
publisherStates.forEach(PublisherState::start);
107107

108-
consumerStates.stream()
109-
.map(s -> s.waitForNewMessages(10))
110-
.parallel()
111-
.forEach(s -> assertThat(s).completes());
108+
List<Sync> syncs =
109+
consumerStates.stream().map(s -> s.waitForNewMessages(10)).collect(toList());
110+
syncs.forEach(s -> assertThat(s).completes());
112111

113112
nodes.forEach(Cli::restartNode);
114113
Cli.rebalance();
115114

116115
waitAtMost(() -> connection.state() == Resource.State.OPEN);
117116

118-
qqNames.stream()
119-
.parallel()
120-
.forEach(
121-
n -> waitAtMostNoException(TIMEOUT.multipliedBy(2), () -> management.queueInfo(n)));
122-
qqNames.stream()
123-
.parallel()
124-
.forEach(
125-
n ->
126-
assertThat(management.queueInfo(n).replicas())
127-
.hasSameSizeAs(nodes)
128-
.containsExactlyInAnyOrderElementsOf(nodes));
129-
130-
publisherStates.stream()
131-
.map(s -> s.waitForNewMessages(10))
132-
.parallel()
133-
.forEach(s -> assertThat(s).completes());
134-
135-
consumerStates.stream()
136-
.map(s -> s.waitForNewMessages(10))
137-
.parallel()
138-
.forEach(s -> assertThat(s).completes());
117+
qqNames.forEach(
118+
n -> waitAtMostNoException(TIMEOUT.multipliedBy(2), () -> management.queueInfo(n)));
119+
qqNames.forEach(
120+
n ->
121+
assertThat(management.queueInfo(n).replicas())
122+
.hasSameSizeAs(nodes)
123+
.containsExactlyInAnyOrderElementsOf(nodes));
124+
125+
syncs = publisherStates.stream().map(s -> s.waitForNewMessages(10)).collect(toList());
126+
syncs.forEach(s -> assertThat(s).completes());
127+
128+
syncs = consumerStates.stream().map(s -> s.waitForNewMessages(10)).collect(toList());
129+
syncs.forEach(s -> assertThat(s).completes());
139130

140131
assertThat(publisherStates).allMatch(s -> s.state() == Resource.State.OPEN);
141132
assertThat(consumerStates).allMatch(s -> s.state() == Resource.State.OPEN);

0 commit comments

Comments
 (0)