Skip to content

Commit 6cee4d9

Browse files
fix tests
1 parent 620cd9c commit 6cee4d9

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/Ydb.Sdk/src/Pool/SessionPool.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,10 @@ internal void OnNotSuccessStatusCode(StatusCode code)
225225
{
226226
// ReSharper disable once InvertIf
227227
if (code is
228-
StatusCode.Cancelled or
229228
StatusCode.BadSession or
230229
StatusCode.SessionBusy or
231-
StatusCode.InternalError or
230+
StatusCode.SessionExpired or
232231
StatusCode.ClientTransportTimeout or
233-
StatusCode.Unavailable or
234232
StatusCode.ClientTransportUnavailable)
235233
{
236234
_logger.LogWarning("Session[{SessionId}] is deactivated. Reason StatusCode: {Code}", SessionId, code);

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/Internal/StatusCodeTestUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class StatusCodeTestUtils
1111
[InlineData(Grpc.Core.StatusCode.DeadlineExceeded, StatusCode.ClientTransportTimeout)]
1212
[InlineData(Grpc.Core.StatusCode.ResourceExhausted, StatusCode.ClientTransportResourceExhausted)]
1313
[InlineData(Grpc.Core.StatusCode.Unimplemented, StatusCode.ClientTransportUnimplemented)]
14-
[InlineData(Grpc.Core.StatusCode.Cancelled, StatusCode.Cancelled)]
14+
[InlineData(Grpc.Core.StatusCode.Cancelled, StatusCode.ClientTransportTimeout)]
1515
public void Code_GrpcCoreStatusCodeConvertToStatusCode_Assert(
1616
Grpc.Core.StatusCode statusCode,
1717
StatusCode expectedStatusCode

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbConnectionTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public async Task YdbDataReader_WhenCancelTokenIsCanceled_ThrowYdbException()
233233
Assert.False(ydbDataReader.IsClosed);
234234
Assert.Equal(1, ydbDataReader.GetValue(0));
235235
Assert.Equal(ConnectionState.Open, connection.State);
236-
Assert.Equal(StatusCode.Cancelled,
236+
Assert.Equal(StatusCode.ClientTransportTimeout,
237237
(await Assert.ThrowsAsync<YdbException>(async () => await ydbDataReader.NextResultAsync(cts.Token))).Code);
238238
Assert.True(ydbDataReader.IsClosed);
239239
Assert.Equal(ConnectionState.Broken, connection.State);
@@ -249,7 +249,7 @@ public async Task YdbDataReader_WhenCancelTokenIsCanceled_ThrowYdbException()
249249
Assert.Equal(1, ydbDataReader.GetValue(0));
250250
Assert.False(ydbDataReader.IsClosed);
251251

252-
Assert.Equal(StatusCode.Cancelled,
252+
Assert.Equal(StatusCode.ClientTransportTimeout,
253253
(await Assert.ThrowsAsync<YdbException>(async () => await ydbDataReader.NextResultAsync(cts.Token))).Code);
254254
Assert.True(ydbDataReader.IsClosed);
255255
Assert.Equal(ConnectionState.Broken, connection.State);
@@ -263,7 +263,7 @@ public async Task ExecuteMethods_WhenCancelTokenIsCanceled_ConnectionIsBroken()
263263
using var cts = new CancellationTokenSource();
264264
cts.Cancel();
265265

266-
Assert.Equal(StatusCode.Cancelled,
266+
Assert.Equal(StatusCode.ClientTransportTimeout,
267267
(await Assert.ThrowsAsync<YdbException>(async () => await command.ExecuteReaderAsync(cts.Token))).Code);
268268
Assert.Equal(ConnectionState.Broken, connection.State);
269269
// ReSharper disable once MethodSupportsCancellation

0 commit comments

Comments
 (0)