@@ -20,7 +20,7 @@ public async Task Reuse_Session_Before_Creating_new()
2020 new YdbConnectionStringBuilder ( ) ) ;
2121 var session = await sessionSource . OpenSession ( ) ;
2222 var sessionId = session . SessionId ( ) ;
23- await session . Close ( ) ;
23+ session . Close ( ) ;
2424 session = await sessionSource . OpenSession ( ) ;
2525 Assert . Equal ( sessionId , session . SessionId ( ) ) ;
2626 }
@@ -58,7 +58,7 @@ public async Task Creating_Session_Throw_Exception()
5858 // ReSharper disable once AccessToModifiedClosure
5959 Interlocked . Increment ( ref countSuccess ) ;
6060 Assert . True ( session . SessionId ( ) > maxSessionSize * 2 ) ;
61- await session . Close ( ) ;
61+ session . Close ( ) ;
6262 }
6363 catch ( YdbException e )
6464 {
@@ -95,7 +95,7 @@ public async Task HighContention_OpenClose_NotCanceledException()
9595 var session = await sessionSource . OpenSession ( ) ;
9696 Assert . True ( session . SessionId ( ) <= maxSessionSize ) ;
9797 await Task . Yield ( ) ;
98- await session . Close ( ) ;
98+ session . Close ( ) ;
9999 } ) ;
100100 }
101101
@@ -124,26 +124,25 @@ public async Task DisposeAsync_Cancel_WaitersSession()
124124 waitingSessionTasks . Add ( Task . Run ( async ( ) =>
125125 {
126126 var session = await sessionSource . OpenSession ( ) ;
127- await session . Close ( ) ;
127+ session . Close ( ) ;
128128 } ) ) ;
129129 }
130130
131- await sessionSource . DisposeAsync ( ) ;
131+ var disposeTask = Task . Run ( async ( ) => await sessionSource . DisposeAsync ( ) ) ;
132132 Assert . Equal ( maxSessionSize , mockFactory . NumSession ) ;
133- Assert . Equal ( "Session Source is disposed." ,
134- ( await Assert . ThrowsAsync < YdbException > ( async ( ) => await sessionSource . OpenSession ( ) ) ) . Message ) ;
135133
136134 for ( var i = 0 ; i < maxSessionSize ; i ++ )
137135 {
138- await Assert . ThrowsAsync < TaskCanceledException > ( ( ) => waitingSessionTasks [ i ] ) ;
136+ openSessions [ i ] . Close ( ) ;
139137 }
140138
139+ await disposeTask ;
140+ Assert . Equal ( 0 , mockFactory . NumSession ) ;
141141 for ( var i = 0 ; i < maxSessionSize ; i ++ )
142142 {
143- await openSessions [ i ] . Close ( ) ;
143+ await Assert . ThrowsAnyAsync < Exception > ( ( ) => waitingSessionTasks [ i ] ) ;
144144 }
145145
146- Assert . Equal ( 0 , mockFactory . NumSession ) ;
147146 Assert . Equal ( "Session Source is disposed." ,
148147 ( await Assert . ThrowsAsync < YdbException > ( async ( ) => await sessionSource . OpenSession ( ) ) ) . Message ) ;
149148 }
@@ -184,7 +183,7 @@ public async Task StressTest_DisposeAsync_Close_Driver()
184183 {
185184 var session = await sessionSource . OpenSession ( ) ;
186185 await Task . Yield ( ) ;
187- await session . Close ( ) ;
186+ session . Close ( ) ;
188187 }
189188 catch ( YdbException e )
190189 {
@@ -226,7 +225,7 @@ public async Task IdleTimeout_MinSessionSize_CloseNumSessionsMinusMinSessionCoun
226225
227226 foreach ( var it in openSessions )
228227 {
229- await it . Close ( ) ;
228+ it . Close ( ) ;
230229 }
231230
232231 await Task . Delay ( TimeSpan . FromSeconds ( idleTimeoutSeconds * 5 ) ) ; // cleaning idle sessions
@@ -240,7 +239,7 @@ public async Task IdleTimeout_MinSessionSize_CloseNumSessionsMinusMinSessionCoun
240239
241240 foreach ( var it in openSessionTasks )
242241 {
243- await ( await it ) . Close ( ) ;
242+ ( await it ) . Close ( ) ;
244243 }
245244
246245 Assert . Equal ( minSessionSize , mockFactory . NumSession ) ;
@@ -273,7 +272,7 @@ public async Task StressTest_HighContention_OpenClose()
273272 while ( ! cts . IsCancellationRequested )
274273 {
275274 var session = await sessionSource . OpenSession ( cts . Token ) ;
276- await session . Close ( ) ;
275+ session . Close ( ) ;
277276 await Task . Delay ( Random . Shared . Next ( maxSessionSize ) , cts . Token ) ;
278277 }
279278 }
@@ -302,7 +301,7 @@ public async Task Get_Session_From_Exhausted_Pool()
302301 cts . CancelAfter ( 500 ) ;
303302
304303 await Assert . ThrowsAsync < TaskCanceledException > ( async ( ) => await sessionSource . OpenSession ( cts . Token ) ) ;
305- await session . Close ( ) ;
304+ session . Close ( ) ;
306305
307306 Assert . Equal ( 1 , mockFactory . NumSession ) ;
308307 Assert . Equal ( 1 , mockFactory . SessionOpenedCount ) ;
@@ -323,7 +322,7 @@ public async Task Return_IsBroken_Session()
323322 for ( var it = 0 ; it < maxSessionSize * 2 ; it ++ )
324323 {
325324 var session = await sessionSource . OpenSession ( ) ;
326- await session . Close ( ) ;
325+ session . Close ( ) ;
327326 }
328327
329328 Assert . Equal ( 0 , mockFactory . NumSession ) ;
@@ -352,7 +351,7 @@ public async Task CheckIdleSession_WhenIsBrokenInStack_CreateNewSession()
352351
353352 foreach ( var session in openSessions )
354353 {
355- await session . Close ( ) ;
354+ session . Close ( ) ;
356355 }
357356
358357 Assert . Equal ( maxSessionSize , mockFactory . NumSession ) ;
@@ -362,7 +361,7 @@ public async Task CheckIdleSession_WhenIsBrokenInStack_CreateNewSession()
362361 {
363362 var session = await sessionSource . OpenSession ( ) ;
364363 isBroken = false ;
365- await session . Close ( ) ;
364+ session . Close ( ) ;
366365 }
367366
368367 Assert . Equal ( 1 , mockFactory . NumSession ) ;
0 commit comments