From 51c42936bf5c24449209932abaf8e540fff0a910 Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Fri, 15 Oct 2021 13:46:09 +0900 Subject: [PATCH] Use MSSQLServerContainer.acceptLicense in tests --- .../test/java/io/trino/plugin/sqlserver/TestingSqlServer.java | 2 +- .../src/test/resources/container-license-acceptance.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 plugin/trino-sqlserver/src/test/resources/container-license-acceptance.txt diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java index c5dba03a2159..43be3f8a6fcd 100644 --- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java +++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java @@ -104,7 +104,7 @@ public String getUsername() String databaseName = "database_" + UUID.randomUUID().toString().replace("-", ""); MSSQLServerContainer container = new TestingMSSQLServerContainer(DOCKER_IMAGE_NAME); - container.addEnv("ACCEPT_EULA", "yes"); + container.acceptLicense(); // enable case sensitive (see the CS below) collation for SQL identifiers container.addEnv("MSSQL_COLLATION", "Latin1_General_CS_AS"); diff --git a/plugin/trino-sqlserver/src/test/resources/container-license-acceptance.txt b/plugin/trino-sqlserver/src/test/resources/container-license-acceptance.txt deleted file mode 100644 index f8f8d280153b..000000000000 --- a/plugin/trino-sqlserver/src/test/resources/container-license-acceptance.txt +++ /dev/null @@ -1 +0,0 @@ -mcr.microsoft.com/mssql/server:2017-CU13