Skip to content

Commit b7f5c8a

Browse files
author
Simone Bordet
committed
Using longer timeouts in tests to avoid failures in the continuous integration environment.
1 parent c9caf3f commit b7f5c8a

File tree

67 files changed

+320
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+320
-314
lines changed

‎cometd-java/cometd-java-annotations/src/test/java/org/cometd/java/annotation/ClientAnnotationProcessorTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,12 @@ private void metaDisconnect(Message connect)
211211
assertTrue(processed);
212212

213213
bayeuxClient.handshake();
214-
assertTrue(handshakeLatch.await(1000, TimeUnit.MILLISECONDS));
214+
assertTrue(handshakeLatch.await(5, TimeUnit.SECONDS));
215215
Message handshake = handshakeRef.get();
216216
assertNotNull(handshake);
217217
assertTrue(handshake.isSuccessful());
218218

219-
assertTrue(connectLatch.await(1000, TimeUnit.MILLISECONDS));
219+
assertTrue(connectLatch.await(5, TimeUnit.SECONDS));
220220
Message connect = connectRef.get();
221221
assertNotNull(connect);
222222
assertTrue(connect.isSuccessful());
@@ -259,11 +259,11 @@ public void onMessage(ClientSessionChannel channel, Message message)
259259
});
260260

261261
bayeuxClient.handshake();
262-
assertTrue(bayeuxClient.waitFor(1000, BayeuxClient.State.CONNECTED));
263-
assertTrue(subscribeLatch.await(1000, TimeUnit.MILLISECONDS));
262+
assertTrue(bayeuxClient.waitFor(5000, BayeuxClient.State.CONNECTED));
263+
assertTrue(subscribeLatch.await(5, TimeUnit.SECONDS));
264264

265265
bayeuxClient.getChannel("/foo").publish(new HashMap());
266-
assertTrue(messageLatch.get().await(1000, TimeUnit.MILLISECONDS));
266+
assertTrue(messageLatch.get().await(5, TimeUnit.SECONDS));
267267

268268
final CountDownLatch unsubscribeLatch = new CountDownLatch(1);
269269
bayeuxClient.getChannel(Channel.META_UNSUBSCRIBE).addListener(new ClientSessionChannel.MessageListener()
@@ -275,12 +275,12 @@ public void onMessage(ClientSessionChannel channel, Message message)
275275
});
276276

277277
processor.deprocessCallbacks(s);
278-
assertTrue(unsubscribeLatch.await(1000, TimeUnit.MILLISECONDS));
278+
assertTrue(unsubscribeLatch.await(5, TimeUnit.SECONDS));
279279

280280
messageLatch.set(new CountDownLatch(1));
281281

282282
bayeuxClient.getChannel("/foo").publish(new HashMap());
283-
assertFalse(messageLatch.get().await(1000, TimeUnit.MILLISECONDS));
283+
assertFalse(messageLatch.get().await(5, TimeUnit.SECONDS));
284284
}
285285

286286
@Test
@@ -339,20 +339,20 @@ public void onMessage(ClientSessionChannel channel, Message message)
339339
});
340340

341341
bayeuxClient.handshake();
342-
assertTrue(connectLatch.await(1000, TimeUnit.MILLISECONDS));
342+
assertTrue(connectLatch.await(5, TimeUnit.SECONDS));
343343
assertTrue(s.connected);
344-
assertTrue(subscribeLatch.await(1000, TimeUnit.MILLISECONDS));
344+
assertTrue(subscribeLatch.await(5, TimeUnit.SECONDS));
345345

346346
messageLatch.set(new CountDownLatch(1));
347347
bayeuxClient.getChannel("/foo").publish(new HashMap());
348-
assertTrue(messageLatch.get().await(1000, TimeUnit.MILLISECONDS));
348+
assertTrue(messageLatch.get().await(5, TimeUnit.SECONDS));
349349

350350
processor.deprocess(s);
351351
assertFalse(s.initialized);
352352

353353
messageLatch.set(new CountDownLatch(1));
354354
bayeuxClient.getChannel("/foo").publish(new HashMap());
355-
assertFalse(messageLatch.get().await(1000, TimeUnit.MILLISECONDS));
355+
assertFalse(messageLatch.get().await(5, TimeUnit.SECONDS));
356356
}
357357

358358
@Test

‎cometd-java/cometd-java-annotations/src/test/java/org/cometd/java/annotation/ServerAnnotationProcessorTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ protected void foo(ServerSession remote, ServerMessage.Mutable message)
437437
remote.handshake();
438438
remote.getChannel("/foo").publish(new HashSet());
439439

440-
assertTrue(messageLatch.await(1000, TimeUnit.MILLISECONDS));
440+
assertTrue(messageLatch.await(5, TimeUnit.SECONDS));
441441
}
442442

443443
@Test
@@ -467,7 +467,7 @@ protected void foo(org.cometd.bayeux.Session remote, Message message)
467467
message.setData(new HashMap());
468468
bayeuxServer.handle((ServerSessionImpl)remote.getServerSession(), message);
469469

470-
assertTrue(messageLatch.await(1000, TimeUnit.MILLISECONDS));
470+
assertTrue(messageLatch.await(5, TimeUnit.SECONDS));
471471
}
472472

473473
@Test
@@ -645,10 +645,10 @@ public void destroy()
645645
S s = new S();
646646

647647
processor.process(s);
648-
assertTrue(initLatch.await(1000, TimeUnit.MILLISECONDS));
648+
assertTrue(initLatch.await(5, TimeUnit.SECONDS));
649649

650650
processor.deprocess(s);
651-
assertTrue(destroyLatch.await(1000, TimeUnit.MILLISECONDS));
651+
assertTrue(destroyLatch.await(5, TimeUnit.SECONDS));
652652
}
653653

654654
@Test
@@ -679,10 +679,10 @@ private void destroy()
679679
SS ss = new SS();
680680

681681
processor.process(ss);
682-
assertTrue(initLatch.await(1000, TimeUnit.MILLISECONDS));
682+
assertTrue(initLatch.await(5, TimeUnit.SECONDS));
683683

684684
processor.deprocess(ss);
685-
assertTrue(destroyLatch.await(1000, TimeUnit.MILLISECONDS));
685+
assertTrue(destroyLatch.await(5, TimeUnit.SECONDS));
686686
}
687687

688688
@Test
@@ -722,10 +722,10 @@ void destroy()
722722
SS ss = new SS();
723723

724724
processor.process(ss);
725-
assertTrue(initLatch.await(1000, TimeUnit.MILLISECONDS));
725+
assertTrue(initLatch.await(5, TimeUnit.SECONDS));
726726

727727
processor.deprocess(ss);
728-
assertTrue(destroyLatch.await(1000, TimeUnit.MILLISECONDS));
728+
assertTrue(destroyLatch.await(5, TimeUnit.SECONDS));
729729
}
730730

731731
@Test
@@ -772,10 +772,10 @@ public void destroy2()
772772
SS ss = new SS();
773773

774774
processor.process(ss);
775-
assertTrue(initLatch.await(1000, TimeUnit.MILLISECONDS));
775+
assertTrue(initLatch.await(5, TimeUnit.SECONDS));
776776

777777
processor.deprocess(ss);
778-
assertTrue(destroyLatch.await(1000, TimeUnit.MILLISECONDS));
778+
assertTrue(destroyLatch.await(5, TimeUnit.SECONDS));
779779
}
780780

781781
@Test

‎cometd-java/cometd-java-client/src/test/java/org/cometd/client/AckExtensionTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,20 +111,20 @@ public void run()
111111

112112
int port = connector.getLocalPort();
113113
connector.stop();
114-
TimeUnit.SECONDS.sleep(1);
114+
Thread.sleep(1000);
115115
Assert.assertTrue(connector.isStopped());
116-
Assert.assertTrue(client.waitFor(10000, BayeuxClient.State.UNCONNECTED));
116+
Assert.assertTrue(client.waitFor(5000, BayeuxClient.State.UNCONNECTED));
117117

118118
// Send messages while client is offline
119119
for (int i = count; i < 2 * count; ++i)
120120
chatChannel.publish(null, "hello_" + i, null);
121121

122-
TimeUnit.SECONDS.sleep(1);
122+
Thread.sleep(1000);
123123
Assert.assertEquals(0, messages.size());
124124

125125
connector.setPort(port);
126126
connector.start();
127-
Assert.assertTrue(client.waitFor(10000, BayeuxClient.State.CONNECTED));
127+
Assert.assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
128128

129129
// Check that the offline messages are received
130130
for (int i = count; i < 2 * count; ++i)

‎cometd-java/cometd-java-client/src/test/java/org/cometd/client/BayeuxClientConcurrentTest.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected boolean sendHandshake()
5959
};
6060
client.setDebugEnabled(debugTests());
6161
client.handshake();
62-
assertTrue(latch.await(1000, TimeUnit.MILLISECONDS));
62+
assertTrue(latch.await(5, TimeUnit.SECONDS));
6363

6464
assertEquals(BayeuxClient.State.DISCONNECTED, client.getState());
6565
}
@@ -82,7 +82,7 @@ protected boolean sendConnect()
8282
};
8383
client.setDebugEnabled(debugTests());
8484
client.handshake();
85-
assertTrue(latch.await(1000, TimeUnit.MILLISECONDS));
85+
assertTrue(latch.await(5, TimeUnit.SECONDS));
8686

8787
assertTrue(client.isDisconnected());
8888
}
@@ -110,7 +110,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
110110
}
111111
});
112112
client.handshake();
113-
assertTrue(client.waitFor(1000, BayeuxClient.State.CONNECTED));
113+
assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
114114

115115
client.getChannel("/test").subscribe(new ClientSessionChannel.MessageListener()
116116
{
@@ -119,8 +119,8 @@ public void onMessage(ClientSessionChannel channel, Message message)
119119
}
120120
});
121121

122-
assertTrue(latch.await(1000, TimeUnit.MILLISECONDS));
123-
assertTrue(client.waitFor(1000, BayeuxClient.State.DISCONNECTED));
122+
assertTrue(latch.await(5, TimeUnit.SECONDS));
123+
assertTrue(client.waitFor(5000, BayeuxClient.State.DISCONNECTED));
124124
}
125125

126126
@Test
@@ -157,7 +157,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
157157
}
158158
});
159159
client.handshake();
160-
assertTrue(client.waitFor(1000, BayeuxClient.State.CONNECTED));
160+
assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
161161

162162
final CountDownLatch publishLatch = new CountDownLatch(1);
163163
ClientSessionChannel channel = client.getChannel(channelName);
@@ -170,14 +170,14 @@ public void onMessage(ClientSessionChannel channel, Message message)
170170
});
171171

172172
// Wait to be subscribed
173-
assertTrue(latch.await(1000, TimeUnit.MILLISECONDS));
173+
assertTrue(latch.await(5, TimeUnit.SECONDS));
174174

175175
// Publish will fail
176176
channel.publish(new HashMap());
177-
assertTrue(failLatch.await(1000, TimeUnit.MILLISECONDS));
178-
assertFalse(publishLatch.await(1000, TimeUnit.MILLISECONDS));
177+
assertTrue(failLatch.await(5, TimeUnit.SECONDS));
178+
assertFalse(publishLatch.await(5, TimeUnit.SECONDS));
179179

180-
assertTrue(client.waitFor(1000, BayeuxClient.State.DISCONNECTED));
180+
assertTrue(client.waitFor(5000, BayeuxClient.State.DISCONNECTED));
181181
}
182182

183183
@Test
@@ -213,10 +213,10 @@ public void onMessage(ClientSessionChannel channel, Message message)
213213
});
214214
client.handshake();
215215

216-
assertTrue(client.waitFor(1000, BayeuxClient.State.UNCONNECTED));
216+
assertTrue(client.waitFor(5000, BayeuxClient.State.UNCONNECTED));
217217

218218
channel.publish(new HashMap());
219-
assertTrue(publishLatch.await(1000, TimeUnit.MILLISECONDS));
219+
assertTrue(publishLatch.await(5, TimeUnit.SECONDS));
220220

221221
disconnectBayeuxClient(client);
222222
}
@@ -312,7 +312,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
312312
try
313313
{
314314
// Be sure messages are not sent (we're still batching)
315-
assertFalse(sendLatch.await(1000, TimeUnit.MILLISECONDS));
315+
assertFalse(sendLatch.await(5, TimeUnit.SECONDS));
316316
}
317317
catch (InterruptedException x)
318318
{
@@ -323,8 +323,8 @@ public void onMessage(ClientSessionChannel channel, Message message)
323323
}
324324
});
325325

326-
assertTrue(sendLatch.await(1000, TimeUnit.MILLISECONDS));
327-
assertTrue(messageLatch.await(1000, TimeUnit.MILLISECONDS));
326+
assertTrue(sendLatch.await(5, TimeUnit.SECONDS));
327+
assertTrue(messageLatch.await(5, TimeUnit.SECONDS));
328328

329329
disconnectBayeuxClient(client);
330330
}

‎cometd-java/cometd-java-client/src/test/java/org/cometd/client/BayeuxClientExtensionTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void testHandshake() throws Exception
4949
CountingExtension extension = new CountingExtension(Channel.META_HANDSHAKE);
5050
client.addExtension(extension);
5151
client.handshake();
52-
Assert.assertTrue(client.waitFor(1000, BayeuxClient.State.CONNECTED));
52+
Assert.assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
5353

5454
Assert.assertEquals(0, extension.rcvs.size());
5555
Assert.assertEquals(1, extension.rcvMetas.size());
@@ -66,10 +66,10 @@ public void testConnect() throws Exception
6666
CountingExtension extension = new CountingExtension(Channel.META_CONNECT);
6767
client.addExtension(extension);
6868
client.handshake();
69-
Assert.assertTrue(client.waitFor(1000, BayeuxClient.State.CONNECTED));
69+
Assert.assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
7070

7171
// Wait for the second connect to be sent
72-
TimeUnit.SECONDS.sleep(1);
72+
Thread.sleep(1000);
7373

7474
Assert.assertEquals(0, extension.rcvs.size());
7575
Assert.assertEquals(1, extension.rcvMetas.size());
@@ -86,7 +86,7 @@ public void testSubscribe() throws Exception
8686
CountingExtension extension = new CountingExtension(Channel.META_SUBSCRIBE);
8787
client.addExtension(extension);
8888
client.handshake();
89-
Assert.assertTrue(client.waitFor(1000, BayeuxClient.State.CONNECTED));
89+
Assert.assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
9090

9191
final CountDownLatch latch = new CountDownLatch(1);
9292
client.getChannel(Channel.META_SUBSCRIBE).addListener(new ClientSessionChannel.MessageListener()
@@ -119,7 +119,7 @@ public void testUnsubscribe() throws Exception
119119
CountingExtension extension = new CountingExtension(Channel.META_UNSUBSCRIBE);
120120
client.addExtension(extension);
121121
client.handshake();
122-
Assert.assertTrue(client.waitFor(1000, BayeuxClient.State.CONNECTED));
122+
Assert.assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
123123

124124
final CountDownLatch latch = new CountDownLatch(1);
125125
client.getChannel(Channel.META_UNSUBSCRIBE).addListener(new ClientSessionChannel.MessageListener()
@@ -162,7 +162,7 @@ public void testPublish() throws Exception
162162
CountingExtension extension = new CountingExtension(channelName);
163163
client.addExtension(extension);
164164
client.handshake();
165-
Assert.assertTrue(client.waitFor(1000, BayeuxClient.State.CONNECTED));
165+
Assert.assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
166166

167167
final ClientSessionChannel channel = client.getChannel(channelName);
168168
client.batch(new Runnable()
@@ -180,7 +180,7 @@ public void onMessage(ClientSessionChannel channel, Message message)
180180
});
181181

182182
// Wait for the message to arrive, along with the publish response
183-
TimeUnit.SECONDS.sleep(1);
183+
Thread.sleep(1000);
184184

185185
Assert.assertEquals(2, extension.rcvs.size());
186186
Assert.assertEquals(0, extension.rcvMetas.size());
@@ -197,10 +197,10 @@ public void testDisconnect() throws Exception
197197
CountingExtension extension = new CountingExtension(Channel.META_DISCONNECT);
198198
client.addExtension(extension);
199199
client.handshake();
200-
Assert.assertTrue(client.waitFor(1000, BayeuxClient.State.CONNECTED));
200+
Assert.assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
201201

202202
// Wait for the second connect to be sent
203-
TimeUnit.SECONDS.sleep(1);
203+
Thread.sleep(1000);
204204

205205
disconnectBayeuxClient(client);
206206

@@ -249,7 +249,7 @@ public boolean sendMeta(ClientSession session, Message.Mutable message)
249249
}
250250
});
251251
client.handshake();
252-
Assert.assertTrue(client.waitFor(1000, BayeuxClient.State.CONNECTED));
252+
Assert.assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
253253

254254
client.getChannel(channelName).publish(new HashMap());
255255

0 commit comments

Comments
 (0)