Skip to content

Commit 1348c3c

Browse files
authored
Improve timeout of tests (dotnet#3026)
* Improve timeout of tests * Increate timeout for column creation in setup
1 parent 1f9eb6a commit 1348c3c

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ public ConversionTests()
7070

7171
foreach (string connectionStr in DataTestUtility.AEConnStringsSetup)
7272
{
73-
using (SqlConnection sqlConnection = new SqlConnection(connectionStr))
73+
var connectionString = new SqlConnectionStringBuilder(connectionStr);
74+
connectionString.ConnectTimeout = Math.Max(connectionString.ConnectTimeout, 30); // The AE tests often fail with a connect timeout in this constructor. Making sure we have a reasonable timeout.
75+
76+
using (SqlConnection sqlConnection = new SqlConnection(connectionString.ConnectionString))
7477
{
7578
sqlConnection.Open();
7679
_databaseObjects.ForEach(o => o.Create(sqlConnection));

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnEncryptionKey.cs

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ WITH VALUES (
3636
using (SqlCommand command = sqlConnection.CreateCommand())
3737
{
3838
command.CommandText = sql;
39+
command.CommandTimeout = 60;
3940
command.ExecuteNonQuery();
4041
}
4142
}
@@ -47,6 +48,7 @@ public override void Drop(SqlConnection sqlConnection)
4748
using (SqlCommand command = sqlConnection.CreateCommand())
4849
{
4950
command.CommandText = sql;
51+
command.CommandTimeout = 60;
5052
command.ExecuteNonQuery();
5153
}
5254
}

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnMasterKey.cs

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public override void Create(SqlConnection sqlConnection)
4242
if (!string.IsNullOrEmpty(sql))
4343
{
4444
command.CommandText = sql;
45+
command.CommandTimeout = 60;
4546
command.ExecuteNonQuery();
4647
}
4748
}
@@ -54,6 +55,7 @@ public override void Drop(SqlConnection sqlConnection)
5455
using (SqlCommand command = sqlConnection.CreateCommand())
5556
{
5657
command.CommandText = sql;
58+
command.CommandTimeout = 60;
5759
command.ExecuteNonQuery();
5860
}
5961
}

src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventCounterTest.cs

+1
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ public void EventCounter_ReclaimedConnectionsCounter_Functional()
152152
// clean pools and pool groups
153153
ClearConnectionPools();
154154
var stringBuilder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { Pooling = true, MaxPoolSize = 1 };
155+
stringBuilder.ConnectTimeout = Math.Max(stringBuilder.ConnectTimeout, 30);
155156

156157
long rc = SqlClientEventSourceProps.ReclaimedConnections;
157158

0 commit comments

Comments
 (0)