Skip to content

Commit 286036f

Browse files
bgraingerbgrainger
committed
Disable tests that fail locally with mysql:8.0 in Docker.
1 parent 4198153 commit 286036f

File tree

3 files changed

+23
-18
lines changed

3 files changed

+23
-18
lines changed

‎azure-pipelines.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
arguments: 'tests\SideBySide\SideBySide.csproj -c Baseline'
6262
testRunTitle: 'Baseline tests'
6363
env:
64-
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,UnixDomainSocket'
64+
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,StreamingResults,UnixDomainSocket'
6565
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=root;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600'
6666
DATA__CERTIFICATESPATH: '$(Build.Repository.LocalPath)\.ci\server\certs\'
6767
DATA__MYSQLBULKLOADERLOCALCSVFILE: '$(Build.Repository.LocalPath)\tests\TestData\LoadData_UTF8_BOM_Unix.CSV'
@@ -128,7 +128,7 @@ jobs:
128128
arguments: '-c Release -f net6.0 --no-restore'
129129
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'Azure', 'net6.0', 'SSL') }}
130130
env:
131-
DATA__UNSUPPORTEDFEATURES: 'CachingSha2Password,Ed25519,GlobalLog,KnownCertificateAuthority,QueryAttributes,RsaEncryption,Sha256Password,Timeout,Tls11,Tls13,UnixDomainSocket,ZeroDateTime'
131+
DATA__UNSUPPORTEDFEATURES: 'CachingSha2Password,Ed25519,GlobalLog,KnownCertificateAuthority,QueryAttributes,RsaEncryption,Sha256Password,StreamingResults,Timeout,Tls11,Tls13,UnixDomainSocket,ZeroDateTime'
132132
DATA__CONNECTIONSTRING: "$(AzureConnectionString);database=mysqltest;ssl mode=Required;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True"
133133

134134
- job: windows_integration_tests_1
@@ -169,7 +169,7 @@ jobs:
169169
arguments: '-c Release --no-restore'
170170
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net472/net5.0', 'No SSL') }}
171171
env:
172-
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Tls11,UnixDomainSocket'
172+
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,StreamingResults,Tls11,UnixDomainSocket'
173173
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True;UseCompression=True'
174174

175175
- job: windows_integration_tests_2
@@ -206,7 +206,7 @@ jobs:
206206
arguments: '-c Release --no-restore'
207207
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'netcoreapp3.1/net6.0', 'No SSL') }}
208208
env:
209-
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Tls11,UnixDomainSocket'
209+
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,StreamingResults,Tls11,UnixDomainSocket'
210210
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
211211

212212
- job: linux_integration_tests
@@ -227,7 +227,7 @@ jobs:
227227
'MySQL 8.0':
228228
image: 'mysql:8.0'
229229
connectionStringExtra: ''
230-
unsupportedFeatures: 'Ed25519,Tls11,ZeroDateTime'
230+
unsupportedFeatures: 'Ed25519,StreamingResults,Tls11,ZeroDateTime'
231231
'MariaDB 10.4':
232232
image: 'mariadb:10.4'
233233
connectionStringExtra: ''

‎tests/SideBySide/CancelTests.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void CancelCommand()
3838
task.Wait(); // shouldn't throw
3939
}
4040

41-
[SkippableFact(ServerFeatures.Timeout)]
41+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout)]
4242
public void CancelReaderAsynchronously()
4343
{
4444
using var barrier = new Barrier(2);
@@ -72,7 +72,7 @@ public void CancelReaderAsynchronously()
7272
task.Wait(); // shouldn't throw
7373
}
7474

75-
[SkippableFact(ServerFeatures.Timeout)]
75+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout)]
7676
public void CancelCommandBeforeRead()
7777
{
7878
using var cmd = new MySqlCommand(c_hugeQuery, m_database.Connection);
@@ -95,7 +95,7 @@ public void CancelCommandBeforeRead()
9595
Assert.InRange(rows, 0, 10000000);
9696
}
9797

98-
[SkippableFact(ServerFeatures.Timeout, Baseline = "Hangs in NextResult")]
98+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout, Baseline = "Hangs in NextResult")]
9999
public void CancelMultiStatementReader()
100100
{
101101
using var barrier = new Barrier(2);
@@ -131,7 +131,7 @@ public void CancelMultiStatementReader()
131131
task.Wait(); // shouldn't throw
132132
}
133133

134-
[SkippableFact(ServerFeatures.Timeout)]
134+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout)]
135135
public void DapperQueryMultiple()
136136
{
137137
Stopwatch stopwatch;
@@ -241,7 +241,7 @@ public void ImplicitCancelWithDapper()
241241
Assert.Equal("value", value);
242242
}
243243

244-
[SkippableFact(ServerFeatures.Timeout)]
244+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout)]
245245
public async Task CancelHugeQueryWithTokenAfterExecuteReader()
246246
{
247247
using var cmd = new MySqlCommand(c_hugeQuery, m_database.Connection);
@@ -265,7 +265,7 @@ public async Task CancelHugeQueryWithTokenAfterExecuteReader()
265265
Assert.False(reader.NextResult());
266266
}
267267

268-
[SkippableFact(ServerFeatures.Timeout)]
268+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout)]
269269
public async Task CancelHugeQueryWithTokenInNextResult()
270270
{
271271
using var cmd = new MySqlCommand(c_hugeQuery + "select 1, 2, 3;", m_database.Connection);
@@ -354,7 +354,7 @@ public async Task CancelSlowQueryWithTokenAfterNextResult()
354354
Assert.False(await reader.NextResultAsync());
355355
}
356356

357-
[SkippableFact(ServerFeatures.Timeout)]
357+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout)]
358358
public async Task CancelMultiStatementInRead()
359359
{
360360
using var cmd = new MySqlCommand(c_hugeQuery + c_hugeQuery + c_hugeQuery, m_database.Connection);
@@ -403,7 +403,7 @@ public void CancelBatchCommand()
403403
task.Wait(); // shouldn't throw
404404
}
405405

406-
[SkippableFact(ServerFeatures.Timeout)]
406+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout)]
407407
public void CancelBatchReaderAsynchronously()
408408
{
409409
using var barrier = new Barrier(2);
@@ -443,7 +443,7 @@ public void CancelBatchReaderAsynchronously()
443443
task.Wait(); // shouldn't throw
444444
}
445445

446-
[SkippableFact(ServerFeatures.Timeout)]
446+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout)]
447447
public void CancelBatchBeforeRead()
448448
{
449449
using var batch = new MySqlBatch(m_database.Connection)
@@ -472,7 +472,7 @@ public void CancelBatchBeforeRead()
472472
Assert.InRange(rows, 0, 10000000);
473473
}
474474

475-
[SkippableFact(ServerFeatures.Timeout, Skip = "COM_MULTI")]
475+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout, Skip = "COM_MULTI")]
476476
public void CancelMultiCommandBatchReader()
477477
{
478478
using var barrier = new Barrier(2);
@@ -611,7 +611,7 @@ value varchar(45)
611611
}
612612
}
613613

614-
[SkippableFact(ServerFeatures.Timeout)]
614+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout)]
615615
public async Task CancelHugeQueryBatchWithTokenAfterExecuteReader()
616616
{
617617
using var batch = new MySqlBatch(m_database.Connection)
@@ -641,7 +641,7 @@ public async Task CancelHugeQueryBatchWithTokenAfterExecuteReader()
641641
Assert.False(reader.NextResult());
642642
}
643643

644-
[SkippableFact(ServerFeatures.Timeout, Skip = "COM_MULTI")]
644+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout, Skip = "COM_MULTI")]
645645
public async Task CancelHugeQueryBatchWithTokenInNextResult()
646646
{
647647
using var batch = new MySqlBatch(m_database.Connection)
@@ -750,7 +750,7 @@ public async Task CancelSlowQueryBatchWithTokenAfterNextResult()
750750
Assert.False(await reader.NextResultAsync());
751751
}
752752

753-
[SkippableFact(ServerFeatures.Timeout, Skip = "COM_MULTI")]
753+
[SkippableFact(ServerFeatures.StreamingResults | ServerFeatures.Timeout, Skip = "COM_MULTI")]
754754
public async Task CancelMultiStatementBatchInRead()
755755
{
756756
using var batch = new MySqlBatch(m_database.Connection)

‎tests/SideBySide/ServerFeatures.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,9 @@ public enum ServerFeatures
2525
ZeroDateTime = 0x4_0000,
2626
QueryAttributes = 0x8_0000,
2727
GlobalLog = 0x10_0000,
28+
29+
/// <summary>
30+
/// The MySQL server can start streaming rows back as soon as they are available, as opposed to buffering the entire result set in memory.
31+
/// </summary>
32+
StreamingResults = 0x20_0000,
2833
}

0 commit comments

Comments
 (0)