From 11041049e1f6cbdadbb7e4c3cbabe15735c6dce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Fri, 8 Nov 2024 10:28:29 +0000 Subject: [PATCH] AMQ-9617: Adjust consumers timeout to avoid race condition on RestTest (cherry picked from commit fa881ad294519f424f0c7500fe4cb30915617e56) --- .../src/test/java/org/apache/activemq/web/RestTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java b/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java index aa5cbdb6354..db923afcf84 100644 --- a/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java +++ b/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java @@ -88,10 +88,10 @@ public void testConsumeAsyncTimeout() throws Exception { // AMQ-9330 - test no 500 error on timeout and instead 204 error Future result = - asyncRequest(httpClient, "http://localhost:" + port + "/message/test?readTimeout=2000&type=queue&clientId=test", new StringBuffer()); + asyncRequest(httpClient, "http://localhost:" + port + "/message/test?readTimeout=1000&type=queue&clientId=test", new StringBuffer()); // try a second request while the first is running, this should get a 500 error since the first is still running and // concurrent access to the same consumer is not allowed - Future errorResult = asyncRequest(httpClient, "http://localhost:" + port + "/message/test?readTimeout=1&type=queue&clientId=test", new StringBuffer()); + Future errorResult = asyncRequest(httpClient, "http://localhost:" + port + "/message/test?readTimeout=10000&type=queue&clientId=test", new StringBuffer()); assertEquals(HttpStatus.INTERNAL_SERVER_ERROR_500, errorResult.get().getResponse().getStatus()); //After the original request finishes, verify 204 and not 500 error assertEquals(HttpStatus.NO_CONTENT_204, result.get().getResponse().getStatus());