Skip to content

Commit 94ff788

Browse files
committed
Allow timeout-based tests to be skipped.
This allows us to skip (for now) testing servers that routinely fail these tests.
1 parent 351b17e commit 94ff788

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

tests/SideBySide/CancelTests.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void NoCancel()
3434
}
3535
}
3636

37-
[Fact]
37+
[SkippableFact(ServerFeatures.Timeout)]
3838
public void CancelCommand()
3939
{
4040
using (var cmd = new MySqlCommand("SELECT SLEEP(5)", m_database.Connection))
@@ -54,7 +54,7 @@ public void CancelCommand()
5454
}
5555
}
5656

57-
[Fact]
57+
[SkippableFact(ServerFeatures.Timeout)]
5858
public void CancelReaderAsynchronously()
5959
{
6060
using (var barrier = new Barrier(2))
@@ -90,7 +90,7 @@ public void CancelReaderAsynchronously()
9090
}
9191
}
9292

93-
[Fact]
93+
[SkippableFact(ServerFeatures.Timeout)]
9494
public void CancelCommandBeforeRead()
9595
{
9696
using (var cmd = new MySqlCommand(c_hugeQuery, m_database.Connection))
@@ -117,7 +117,7 @@ public void CancelCommandBeforeRead()
117117
}
118118
}
119119

120-
[SkippableFact(Baseline = "Hangs in NextResult")]
120+
[SkippableFact(ServerFeatures.Timeout, Baseline = "Hangs in NextResult")]
121121
public void CancelMultiStatementReader()
122122
{
123123
using (var barrier = new Barrier(2))
@@ -155,7 +155,7 @@ public void CancelMultiStatementReader()
155155
}
156156
}
157157

158-
[Fact]
158+
[SkippableFact(ServerFeatures.Timeout)]
159159
public void DapperQueryMultiple()
160160
{
161161
Stopwatch stopwatch;
@@ -173,7 +173,7 @@ public void DapperQueryMultiple()
173173
}
174174

175175
#if !BASELINE
176-
[Fact]
176+
[SkippableFact(ServerFeatures.Timeout)]
177177
public async Task CancelCommandWithTokenBeforeExecuteScalar()
178178
{
179179
using (var cmd = new MySqlCommand("select 1;", m_database.Connection))
@@ -190,7 +190,7 @@ public async Task CancelCommandWithTokenBeforeExecuteScalar()
190190
}
191191
}
192192

193-
[Fact]
193+
[SkippableFact(ServerFeatures.Timeout)]
194194
public async Task CancelCommandWithTokenBeforeExecuteNonQuery()
195195
{
196196
using (var cmd = new MySqlCommand("select 1;", m_database.Connection))
@@ -207,7 +207,7 @@ public async Task CancelCommandWithTokenBeforeExecuteNonQuery()
207207
}
208208
}
209209

210-
[Fact]
210+
[SkippableFact(ServerFeatures.Timeout)]
211211
public async Task CancelCommandWithTokenBeforeExecuteReader()
212212
{
213213
using (var cmd = new MySqlCommand("select 1;", m_database.Connection))
@@ -271,7 +271,7 @@ public void ImplicitCancelWithDapper()
271271
Assert.Equal("value", value);
272272
}
273273

274-
[Fact]
274+
[SkippableFact(ServerFeatures.Timeout)]
275275
public async Task CancelHugeQueryWithTokenAfterExecuteReader()
276276
{
277277
using (var cmd = new MySqlCommand(c_hugeQuery, m_database.Connection))
@@ -297,7 +297,7 @@ public async Task CancelHugeQueryWithTokenAfterExecuteReader()
297297
}
298298
}
299299

300-
[Fact]
300+
[SkippableFact(ServerFeatures.Timeout)]
301301
public async Task CancelHugeQueryWithTokenInNextResult()
302302
{
303303
using (var cmd = new MySqlCommand(c_hugeQuery + "select 1, 2, 3;", m_database.Connection))
@@ -326,7 +326,7 @@ public async Task CancelHugeQueryWithTokenInNextResult()
326326
}
327327
}
328328

329-
[Fact]
329+
[SkippableFact(ServerFeatures.Timeout)]
330330
public async Task CancelSlowQueryWithTokenAfterExecuteReader()
331331
{
332332
using (var cmd = new MySqlCommand(c_slowQuery, m_database.Connection))
@@ -355,7 +355,7 @@ public async Task CancelSlowQueryWithTokenAfterExecuteReader()
355355
}
356356
}
357357

358-
[Fact]
358+
[SkippableFact(ServerFeatures.Timeout)]
359359
public async Task CancelSlowQueryWithTokenAfterNextResult()
360360
{
361361
using (var cmd = new MySqlCommand("SELECT 1; " + c_slowQuery, m_database.Connection))
@@ -391,7 +391,7 @@ public async Task CancelSlowQueryWithTokenAfterNextResult()
391391
}
392392
}
393393

394-
[Fact]
394+
[SkippableFact(ServerFeatures.Timeout)]
395395
public async Task CancelMultiStatementInRead()
396396
{
397397
using (var cmd = new MySqlCommand(c_hugeQuery + c_hugeQuery + c_hugeQuery, m_database.Connection))

tests/SideBySide/ConnectAsync.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public async Task ConnectKeepAlive()
112112
}
113113
}
114114

115-
[Fact]
115+
[SkippableFact(ServerFeatures.Timeout)]
116116
public async Task ConnectTimeoutAsync()
117117
{
118118
var csb = new MySqlConnectionStringBuilder

tests/SideBySide/ConnectSync.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void ConnectionPoolNoPassword()
193193
}
194194
}
195195

196-
[Fact]
196+
[SkippableFact(ServerFeatures.Timeout)]
197197
public void ConnectTimeout()
198198
{
199199
var csb = new MySqlConnectionStringBuilder

tests/SideBySide/ServerFeatures.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ public enum ServerFeatures
1313
LargePackets = 16,
1414
CachingSha2Password = 32,
1515
SessionTrack = 64,
16+
Timeout = 128,
1617
}
1718
}

0 commit comments

Comments
 (0)