Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mariadb tests #8198

Merged
merged 4 commits into from
Nov 30, 2022
Merged

Fix mariadb tests #8198

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a86b400
Do not skip tests if DB setup failed
benjaminpetit Nov 29, 2022
f03a43c
Pin mariadb version to 10.6 (LTS)
benjaminpetit Nov 29, 2022
30f7040
Skip MembershipTableTests when no connection string configured
benjaminpetit Nov 29, 2022
41dc7bb
Fix RelationalStoreTestsBase
benjaminpetit Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
provider: ["MySql"]
services:
mariadb:
image: mariadb
image: mariadb:10.6
ports:
- 3306:3306
env:
Expand Down
11 changes: 2 additions & 9 deletions test/Extensions/TesterAdoNet/StorageTests/MySqlRelationalStoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
Expand All @@ -20,14 +20,7 @@ public class Fixture
{
public Fixture()
{
try
{
Storage = RelationalStorageForTesting.SetupInstance(AdoNetInvariantName, TestDatabaseName).GetAwaiter().GetResult();
}
catch (Exception ex)
{
Console.WriteLine($"Failed to initialize {AdoNetInvariantName} for testing: {ex}");
}
Storage = RelationalStorageForTesting.SetupInstance(AdoNetInvariantName, TestDatabaseName).GetAwaiter().GetResult();
}

public RelationalStorageForTesting Storage { get; private set; }
Expand Down
13 changes: 3 additions & 10 deletions test/TesterInternal/ConnectionStringFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,10 @@ public string ConnectionString
$"{nameof(InitializeConnectionStringAccessor)} was not called before accessing the connection string");
}

try
var connString = this.connectionStringLazy.Value.Result;
if (connString != null)
{
var connString = this.connectionStringLazy.Value.Result;
if (connString != null)
{
return connString;
}
}
catch (Exception ex)
{
throw new SkipException("Environment is not correctly set up to run these tests. " + ex);
return connString;
}

throw new SkipException("Environment is not correctly set up to run these tests. Connection string is empty.");
Expand Down