diff --git a/src/test/Mandatory/BatchTests.cs b/src/test/Mandatory/BatchTests.cs index b83f4185..f0032d19 100644 --- a/src/test/Mandatory/BatchTests.cs +++ b/src/test/Mandatory/BatchTests.cs @@ -41,7 +41,8 @@ namespace test [Fact] public void GitClone() { - _serverFixture.EnsureTestDb(); + Assert.True(_serverFixture.EnsureTestDb()); + Assert.NotNull (_fixture.DbContext.Project); var firstProject = _fixture.DbContext.Project.Include(p=>p.Repository).FirstOrDefault(); Assert.NotNull (firstProject); var di = new DirectoryInfo(_serverFixture.SiteSetup.GitRepository); diff --git a/src/test/Mandatory/Database.cs b/src/test/Mandatory/Database.cs index 8510f5c6..9abb6008 100644 --- a/src/test/Mandatory/Database.cs +++ b/src/test/Mandatory/Database.cs @@ -5,7 +5,7 @@ using Xunit.Abstractions; namespace test.Mandatory { [Collection("Database")] - [Trait("regres", "yes")] + [Trait("regres", "no")] [Trait("dev", "wip")] public class Database: IClassFixture, IDisposable { diff --git a/src/test/Mandatory/ServerSideFixture.cs b/src/test/Mandatory/ServerSideFixture.cs index ba14967d..636c3c4e 100644 --- a/src/test/Mandatory/ServerSideFixture.cs +++ b/src/test/Mandatory/ServerSideFixture.cs @@ -155,6 +155,7 @@ namespace test NpgsqlConnection cx = new NpgsqlConnection(Startup.Testing.ConnectionStrings.DatabaseCtor)) { cx.Open(); + _logger.LogInformation($"check db for TestingDatabase:{TestingDatabase}"); var command = cx.CreateCommand(); command.CommandText = $"SELECT 1 FROM pg_database WHERE datname='{TestingDatabase}';"; dbCreated = (command.ExecuteScalar()!=null); @@ -165,19 +166,21 @@ namespace test public bool EnsureTestDb() { - CheckDbExistence(); - if (!dbCreated) + if (!DbCreated) { using (NpgsqlConnection cx = new NpgsqlConnection(Startup.Testing.ConnectionStrings.DatabaseCtor)) { + _logger.LogInformation($"create database for TestingDatabase : {TestingDatabase}"); cx.Open(); var command = cx.CreateCommand(); using (NpgsqlConnection ownercx = new NpgsqlConnection(Startup.Testing.ConnectionStrings.Default)) - command.CommandText = $"create database '{TestingDatabase}' OWNER = '{ownercx.UserName}';"; + command.CommandText = $"create database \"{TestingDatabase}\" OWNER \"{ownercx.UserName}\";"; + _logger.LogInformation(command.CommandText); command.ExecuteNonQuery(); } - dbCreated = DbContext.Database.EnsureCreated(); + dbCreated = true; + } return dbCreated; } @@ -194,7 +197,9 @@ namespace test Logger.LogInformation("Disposing"); } - public bool DbCreated { get { return dbCreated; } } + public bool DbCreated { get { + CheckDbExistence(); + return dbCreated; } } } } diff --git a/version.txt b/version.txt index 6515899a..f161c492 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.6-rc16 +1.0.6-rc17