Skip to content

Commit ba0ba99

Browse files
authored
Issue #12315 fix flakey session AsyncTest (#12316)
1 parent 8aa9c8b commit ba0ba99

File tree

2 files changed

+10
-3
lines changed
  • jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/src/test/java/org/eclipse/jetty/ee10/session
  • jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/src/test/java/org/eclipse/jetty/ee9/session

2 files changed

+10
-3
lines changed

jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/src/test/java/org/eclipse/jetty/ee10/session/AsyncTest.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public void testSessionWithAsyncDispatch() throws Exception
6060

6161
DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory();
6262
cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT);
63+
cacheFactory.setFlushOnResponseCommit(true);
6364
SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory();
6465
SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);
6566

@@ -106,6 +107,7 @@ public void testSessionWithAsyncComplete() throws Exception
106107

107108
DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory();
108109
cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT);
110+
cacheFactory.setFlushOnResponseCommit(true);
109111
SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory();
110112
SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);
111113

@@ -156,6 +158,7 @@ public void testSessionWithCrossContextAsync() throws Exception
156158

157159
DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory();
158160
cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT);
161+
cacheFactory.setFlushOnResponseCommit(true);
159162
SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory();
160163
SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);
161164

@@ -202,9 +205,9 @@ public void testSessionWithCrossContextAsync() throws Exception
202205
@Test
203206
public void testSessionCreatedBeforeDispatch() throws Exception
204207
{
205-
206208
DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory();
207209
cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT);
210+
cacheFactory.setFlushOnResponseCommit(true);
208211
SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory();
209212
SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);
210213

@@ -257,6 +260,7 @@ public void testSessionWithCrossContextAsyncComplete() throws Exception
257260

258261
DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory();
259262
cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT);
263+
cacheFactory.setFlushOnResponseCommit(true);
260264
SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory();
261265
SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);
262266

jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/src/test/java/org/eclipse/jetty/ee9/session/AsyncTest.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public void testSessionWithAsyncDispatch() throws Exception
6060

6161
DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory();
6262
cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT);
63+
cacheFactory.setFlushOnResponseCommit(true);
6364
SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory();
6465
SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);
6566

@@ -102,9 +103,9 @@ public void testSessionWithAsyncDispatch() throws Exception
102103
public void testSessionWithAsyncComplete() throws Exception
103104
{
104105
// Test async write, which creates a session and completes outside of a dispatch
105-
106106
DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory();
107107
cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT);
108+
cacheFactory.setFlushOnResponseCommit(true);
108109
SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory();
109110
SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);
110111

@@ -153,6 +154,7 @@ public void testSessionWithCrossContextAsync() throws Exception
153154

154155
DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory();
155156
cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT);
157+
cacheFactory.setFlushOnResponseCommit(true);
156158
SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory();
157159
SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);
158160

@@ -198,9 +200,9 @@ public void testSessionWithCrossContextAsync() throws Exception
198200
@Test
199201
public void testSessionCreatedBeforeDispatch() throws Exception
200202
{
201-
202203
DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory();
203204
cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT);
205+
cacheFactory.setFlushOnResponseCommit(true);
204206
SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory();
205207
SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);
206208

@@ -252,6 +254,7 @@ public void testSessionWithCrossContextAsyncComplete() throws Exception
252254

253255
DefaultSessionCacheFactory cacheFactory = new DefaultSessionCacheFactory();
254256
cacheFactory.setEvictionPolicy(SessionCache.EVICT_ON_SESSION_EXIT);
257+
cacheFactory.setFlushOnResponseCommit(true);
255258
SessionDataStoreFactory storeFactory = new TestSessionDataStoreFactory();
256259
SessionTestSupport server = new SessionTestSupport(0, -1, -1, cacheFactory, storeFactory);
257260

0 commit comments

Comments
 (0)