Make test for timeout more stringent. Fixes #628

bgrainger · bgrainger · commit d38be8b12cbd · 2019-04-10T12:52:42.000-07:00
diff --git a/src/MySqlConnector/Protocol/Serialization/StreamByteHandler.cs b/src/MySqlConnector/Protocol/Serialization/StreamByteHandler.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using MySql.Data.MySqlClient;
@@ -38,7 +39,7 @@ ValueTask<int> DoReadBytesSync(ArraySegment<byte> buffer_)
 				}
 				catch (Exception ex)
 				{
-					if (ex is IOException && RemainingTimeout != Constants.InfiniteTimeout)
+					if (RemainingTimeout != Constants.InfiniteTimeout && ex is IOException ioException && ioException.InnerException is SocketException socketException && socketException.SocketErrorCode == SocketError.TimedOut)
 						return ValueTaskExtensions.FromException<int>(MySqlException.CreateForTimeout(ex));
 					return ValueTaskExtensions.FromException<int>(ex);
 				}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
	`3`	`+using System.Net.Sockets;`
`3`	`4`	`using System.Threading;`
`4`	`5`	`using System.Threading.Tasks;`
`5`	`6`	`using MySql.Data.MySqlClient;`
`@@ -38,7 +39,7 @@ ValueTask<int> DoReadBytesSync(ArraySegment<byte> buffer_)`
`38`	`39`	`}`
`39`	`40`	`catch (Exception ex)`
`40`	`41`	`{`
`41`		`- if (ex is IOException && RemainingTimeout != Constants.InfiniteTimeout)`
	`42`	`+ if (RemainingTimeout != Constants.InfiniteTimeout && ex is IOException ioException && ioException.InnerException is SocketException socketException && socketException.SocketErrorCode == SocketError.TimedOut)`
`42`	`43`	`return ValueTaskExtensions.FromException<int>(MySqlException.CreateForTimeout(ex));`
`43`	`44`	`return ValueTaskExtensions.FromException<int>(ex);`
`44`	`45`	`}`