From ba0ba9991911d070aa0147143ac7e0f906863d60 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 26 Sep 2024 16:45:59 +1000 Subject: [PATCH] Issue #12315 fix flakey session AsyncTest (#12316) --- .../java/org/eclipse/jetty/ee10/session/AsyncTest.java | 6 +++++- .../test/java/org/eclipse/jetty/ee9/session/AsyncTest.java | 7 +++++-- 2 files changed, 10 insertions(+), 3 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/AsyncTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/src/test/java/org/eclipse/jetty/ee10/session/AsyncTest.java index d6d60c97ff91..a89cfae4e990 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/src/test/java/org/eclipse/jetty/ee10/session/AsyncTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/src/test/java/org/eclipse/jetty/ee10/session/AsyncTest.java @@ -60,6 +60,7 @@ public void testSessionWithAsyncDispatch() throws Exception DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT); + cacheFactory.setFlushOnResponseCommit(true); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory); @@ -106,6 +107,7 @@ public void testSessionWithAsyncComplete() throws Exception DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT); + cacheFactory.setFlushOnResponseCommit(true); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory); @@ -156,6 +158,7 @@ public void testSessionWithCrossContextAsync() throws Exception DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT); + cacheFactory.setFlushOnResponseCommit(true); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory); @@ -202,9 +205,9 @@ public void testSessionWithCrossContextAsync() throws Exception @Test public void testSessionCreatedBeforeDispatch() throws Exception { - DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT); + cacheFactory.setFlushOnResponseCommit(true); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory); @@ -257,6 +260,7 @@ public void testSessionWithCrossContextAsyncComplete() throws Exception DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT); + cacheFactory.setFlushOnResponseCommit(true); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory); diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/src/test/java/org/eclipse/jetty/ee9/session/AsyncTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/src/test/java/org/eclipse/jetty/ee9/session/AsyncTest.java index 0923120a8b11..b00e45316fbe 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/src/test/java/org/eclipse/jetty/ee9/session/AsyncTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/src/test/java/org/eclipse/jetty/ee9/session/AsyncTest.java @@ -60,6 +60,7 @@ public void testSessionWithAsyncDispatch() throws Exception DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT); + cacheFactory.setFlushOnResponseCommit(true); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory); @@ -102,9 +103,9 @@ public void testSessionWithAsyncDispatch() throws Exception public void testSessionWithAsyncComplete() throws Exception { // Test async write, which creates a session and completes outside of a dispatch - DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT); + cacheFactory.setFlushOnResponseCommit(true); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory); @@ -153,6 +154,7 @@ public void testSessionWithCrossContextAsync() throws Exception DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT); + cacheFactory.setFlushOnResponseCommit(true); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory); @@ -198,9 +200,9 @@ public void testSessionWithCrossContextAsync() throws Exception @Test public void testSessionCreatedBeforeDispatch() throws Exception { - DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT); + cacheFactory.setFlushOnResponseCommit(true); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory); @@ -252,6 +254,7 @@ public void testSessionWithCrossContextAsyncComplete() throws Exception DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory(); cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT); + cacheFactory.setFlushOnResponseCommit(true); SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory(); SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);