From ef80af94f8396a12dd4617533e9e746cebda4a7b Mon Sep 17 00:00:00 2001 From: Davoud Eshtehari Date: Thu, 1 Apr 2021 13:16:38 -0700 Subject: [PATCH 1/2] fix --- .../SQL/ParameterTest/StreamInputParam.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs index 7b12c6533d..7865175e18 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs @@ -625,22 +625,17 @@ private static void CommandReuse() byte[] binarydata = new byte[dataSize]; rand.NextBytes(binarydata); MemoryStream ms = new MemoryStream(binarydata, false); - cmd.CommandText = "insert into #blobs (Id, blob) values (1, @blob)"; + // Included a daly to make a room for cancellation command + cmd.CommandText = "WAITFOR DELAY '00:00:05'; insert into #blobs (Id, blob) values (1, @blob)"; cmd.Parameters.Add("@blob", SqlDbType.VarBinary, dataSize); cmd.Parameters["@blob"].Direction = ParameterDirection.Input; cmd.Parameters["@blob"].Value = ms; - Task t = func(cmd, cts.Token); - if (!t.IsCompleted) - { - cts.Cancel(); - } - try { - t.Wait(); - Console.WriteLine("FAIL: Expected AggregateException on Task wait for Cancelled Task! Task Status: " + t.Status); + Task.WaitAll(func(cmd, cts.Token), Task.Run(() => cts.Cancel())); + Console.WriteLine("FAIL: Expected AggregateException on Task wait for Cancelled Task!"); } catch (AggregateException ae) { From 456de3be559773e41b43337961b105c19bf2a1c6 Mon Sep 17 00:00:00 2001 From: DavoudEshtehari <61173489+DavoudEshtehari@users.noreply.github.com> Date: Thu, 1 Apr 2021 17:08:20 -0700 Subject: [PATCH 2/2] Update src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs Co-authored-by: David Engel --- .../tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs index 7865175e18..65e32cca90 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs @@ -625,7 +625,7 @@ private static void CommandReuse() byte[] binarydata = new byte[dataSize]; rand.NextBytes(binarydata); MemoryStream ms = new MemoryStream(binarydata, false); - // Included a daly to make a room for cancellation command + // Include a delay to allow time for cancellation cmd.CommandText = "WAITFOR DELAY '00:00:05'; insert into #blobs (Id, blob) values (1, @blob)"; cmd.Parameters.Add("@blob", SqlDbType.VarBinary, dataSize);