From aef8cb1b50c9fddb7f1715f2066fde0b835cc7d7 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 24 Apr 2024 15:42:29 +0200 Subject: [PATCH] Issue #11676 fix session CreationTest (#11685) --- .../jetty/ee10/session/CreationTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/src/test/java/org/eclipse/jetty/ee10/session/CreationTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/src/test/java/org/eclipse/jetty/ee10/session/CreationTest.java index 83148ef4b3d..8e829ba4833 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/src/test/java/org/eclipse/jetty/ee10/session/CreationTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/src/test/java/org/eclipse/jetty/ee10/session/CreationTest.java @@ -200,7 +200,7 @@ public class CreationTest assertEquals(HttpServletResponse.SC_OK, response.getStatus()); //check that the session does not exist - assertFalse(contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); + Awaitility.waitAtMost(5, TimeUnit.SECONDS).until(() -> !contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); } finally { @@ -245,7 +245,7 @@ public class CreationTest assertEquals(HttpServletResponse.SC_OK, response.getStatus()); //check that the session does not exist - assertFalse(contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); + Awaitility.waitAtMost(5, TimeUnit.SECONDS).until(() -> !contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); } finally { @@ -287,8 +287,8 @@ public class CreationTest ContentResponse response = client.GET(url); assertEquals(HttpServletResponse.SC_OK, response.getStatus()); - //check that the session does not exist - assertTrue(contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); + //check the session + Awaitility.waitAtMost(5, TimeUnit.SECONDS).until(() -> contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); assertThat(response.getHeaders().getValuesList(HttpHeader.SET_COOKIE).size(), Matchers.is(1)); } finally @@ -338,8 +338,8 @@ public class CreationTest assertEquals(HttpServletResponse.SC_OK, response.getStatus()); //check that the sessions exist persisted - assertTrue(contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); - assertTrue(ctxB.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); + Awaitility.waitAtMost(5, TimeUnit.SECONDS).until(() -> contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); + Awaitility.waitAtMost(5, TimeUnit.SECONDS).until(() -> ctxB.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); } finally { @@ -387,9 +387,9 @@ public class CreationTest ContentResponse response = client.GET(url + "?action=forwardinv"); assertEquals(HttpServletResponse.SC_OK, response.getStatus()); - //check that the session does not exist - assertFalse(contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); - assertFalse(ctxB.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); + //check that the session does not exist + Awaitility.waitAtMost(5, TimeUnit.SECONDS).until(() -> !contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); + Awaitility.waitAtMost(5, TimeUnit.SECONDS).until(() -> !ctxB.getSessionHandler().getSessionCache().getSessionDataStore().exists(servlet._id)); } finally {