Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed flaky test. 

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2023-11-20 09:02:34 +01:00
parent e933116997
commit da2c601cd7
No known key found for this signature in database
GPG Key ID: 1677D141BCF3584D
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/src/test/java/org/eclipse/jetty/ee10/session/DuplicateCookieTest.java
View File

@ -38,8 +38,10 @@ import org.eclipse.jetty.session.SessionManager;
import org.eclipse.jetty.session.test.TestSessionDataStoreFactory;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.component.LifeCycle;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@ -128,7 +130,7 @@ public class DuplicateCookieTest
assertEquals("4422", response.getContentAsString());
//check session is drained of requests
assertEquals(0, s4422.getRequests());
await().atMost(5, TimeUnit.SECONDS).until(s4422::getRequests, Matchers.is(0L));
}
finally
{

6
jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/src/test/java/org/eclipse/jetty/ee9/session/DuplicateCookieTest.java
View File

@ -21,7 +21,6 @@ import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import org.awaitility.Awaitility;
import org.eclipse.jetty.client.ContentResponse;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.Request;
@ -42,6 +41,7 @@ import org.eclipse.jetty.util.component.LifeCycle;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@ -130,7 +130,7 @@ public class DuplicateCookieTest
assertEquals("4422", response.getContentAsString());
//check session is drained of requests
assertEquals(0, s4422.getRequests());
await().atMost(5, TimeUnit.SECONDS).until(s4422::getRequests, Matchers.is(0L));
}
finally
{
@ -419,7 +419,7 @@ public class DuplicateCookieTest
assertEquals(HttpServletResponse.SC_OK, response.getStatus());
//check that all valid sessions have their request counts decremented correctly after the request, back to 0
Awaitility.await().atMost(30, TimeUnit.SECONDS).until(s1234::getRequests, Matchers.is(0L));
await().atMost(30, TimeUnit.SECONDS).until(s1234::getRequests, Matchers.is(0L));
}
finally
{