Move LeakReaders test to MySqlConnection.Tests.

This test can be run against the fake server since it only tests local connection pool behaviour.

Author: bgrainger

tests/MySqlConnector.Tests/ConnectionTests.cs

@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Diagnostics;
+using System.Threading;
 using System.Threading.Tasks;
 using MySql.Data.MySqlClient;
 using Xunit;
@@ -90,6 +91,32 @@ public async Task ConnectionLifeTime(uint lifeTime, uint delaySeconds, bool shou
 			}
 		}
 
+		[Fact]
+		public void LeakReaders()
+		{
+			m_csb.Pooling = true;
+			m_csb.MinimumPoolSize = 0;
+			m_csb.MaximumPoolSize = 6;
+			m_csb.ConnectionTimeout = 30u;
+
+			for (var i = 0; i < m_csb.MaximumPoolSize + 2; i++)
+			{
+				var connection = new MySqlConnection(m_csb.ConnectionString);
+				connection.Open();
+
+				var cmd = connection.CreateCommand();
+				cmd.CommandText = "SELECT 1;";
+				var reader = cmd.ExecuteReader();
+				Assert.True(reader.Read());
+
+				// have to GC for leaked connections to be removed from the pool
+				GC.Collect();
+
+				// HACK: have to sleep (so that RecoverLeakedSessions is called in ConnectionPool.GetSessionAsync)
+				Thread.Sleep(250);
+			}
+		}
+
 		private static async Task WaitForConditionAsync<T>(T expected, Func<T> getValue)
 		{
 			var sw = Stopwatch.StartNew();

tests/MySqlConnector.Tests/FakeMySqlServerConnection.cs

@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.IO;
 using System.Net.Sockets;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using MySql.Data.MySqlClient;
@@ -41,14 +42,39 @@ public async Task RunAsync(TcpClient client, CancellationToken token)
 							break;
 
 						case CommandKind.Ping:
-						case CommandKind.Query:
 						case CommandKind.ResetConnection:
+							await SendAsync(stream, 1, WriteOk);
+							break;
+
+						case CommandKind.Query:
+							var query = Encoding.UTF8.GetString(bytes, 1, bytes.Length - 1);
+							Match match;
+							if (query == "SET NAMES utf8mb4 COLLATE utf8mb4_bin;")
+							{
 								await SendAsync(stream, 1, WriteOk);
+							}
+							else if ((match = Regex.Match(query, @"^SELECT ([0-9]+)(;|$)")).Success)
+							{
+								var number = match.Groups[1].Value;
+								var data = new byte[number.Length + 1];
+								data[0] = (byte) number.Length;
+								Encoding.UTF8.GetBytes(number, 0, number.Length, data, 1);
+
+								await SendAsync(stream, 1, x => x.Write((byte) 1)); // one column
+								await SendAsync(stream, 2, x => x.Write(new byte[] { 3, 0x64, 0x65, 0x66, 0, 0, 0, 1, 0x5F, 0, 0x0c, 0x3f, 0, 1, 0, 0, 0, 8, 0x81, 0, 0, 0, 0 })); // column definition
+								await SendAsync(stream, 3, x => x.Write(new byte[] { 0xFE, 0, 0, 2, 0 })); // EOF
+								await SendAsync(stream, 4, x => x.Write(data));
+								await SendAsync(stream, 5, x => x.Write(new byte[] { 0xFE, 0, 0, 2, 0 })); // EOF
+							}
+							else
+							{
+								await SendAsync(stream, 1, x => WriteError(x, "Unhandled query: " + query));
+							}
 							break;
 
 						default:
 							Console.WriteLine("** UNHANDLED ** {0}", (CommandKind) bytes[0]);
-							await SendAsync(stream, 1, WriteError);
+							await SendAsync(stream, 1, x => WriteError(x));
 							break;
 						}
 					}
@@ -142,15 +168,15 @@ private static void WriteOk(BinaryWriter writer)
 			writer.Write((ushort) 0); // warning count
 		}
 
-		private static void WriteError(BinaryWriter writer)
+		private static void WriteError(BinaryWriter writer, string message = "An unknown error occurred")
 		{
 			writer.Write((byte) 0xFF); // signature
 			writer.Write((ushort) MySqlErrorCode.UnknownError); // error code
 			writer.WriteRaw("#ERROR");
-			writer.WriteRaw("An unknown error occurred");
+			writer.WriteRaw(message);
 		}
 
 		readonly FakeMySqlServer m_server;
 		readonly int m_connectionId;
 	}
-}
+}

tests/SideBySide/ConnectionPool.cs

@@ -149,36 +149,6 @@ public void LeakConnections()
 			}
 		}
 
-#if BASELINE
-		[Fact(Skip = "Throws MySqlException - error connecting: Timeout expired")]
-#else
-		[Fact]
-#endif
-		public void LeakReaders()
-		{
-			var csb = AppConfig.CreateConnectionStringBuilder();
-			csb.Pooling = true;
-			csb.MinimumPoolSize = 0;
-			csb.MaximumPoolSize = 6;
-			csb.ConnectionTimeout = 3u;
-
-			for (int i = 0; i < csb.MaximumPoolSize + 2; i++)
-			{
-				var connection = new MySqlConnection(csb.ConnectionString);
-				connection.Open();
-				var cmd = connection.CreateCommand();
-				cmd.CommandText = "SELECT 1";
-				var reader = cmd.ExecuteReader();
-				Assert.True(reader.Read());
-
-				// have to GC for leaked connections to be removed from the pool
-				GC.Collect();
-
-				// HACK: have to sleep (so that RecoverLeakedSessions is called in ConnectionPool.GetSessionAsync?)
-				Thread.Sleep(250);
-			}
-		}
-
 		[Fact]
 		public async Task WaitTimeout()
 		{