Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1350 from jbonofre/AMQ-9617 

AMQ-9617: Adjust consumers timeout to avoid race condition on RestTest
This commit is contained in:
JB Onofré 2024-11-08 11:47:15 +01:00 committed by GitHub
parent a621df7aff fa881ad294
commit aa842da287
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java
View File

@ -88,10 +88,10 @@ public class RestTest extends JettyTestSupport {
// AMQ-9330 - test no 500 error on timeout and instead 204 error // AMQ-9330 - test no 500 error on timeout and instead 204 error
Future<Result> result = Future<Result> 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 // 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 // concurrent access to the same consumer is not allowed
Future<Result> errorResult = asyncRequest(httpClient, "http://localhost:" + port + "/message/test?readTimeout=1&type=queue&clientId=test", new StringBuffer()); Future<Result> 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()); assertEquals(HttpStatus.INTERNAL_SERVER_ERROR_500, errorResult.get().getResponse().getStatus());
//After the original request finishes, verify 204 and not 500 error //After the original request finishes, verify 204 and not 500 error
assertEquals(HttpStatus.NO_CONTENT_204, result.get().getResponse().getStatus()); assertEquals(HttpStatus.NO_CONTENT_204, result.get().getResponse().getStatus());