From 0c8fa8b4b590f934866872833bb2cc75d648f88d Mon Sep 17 00:00:00 2001 From: James Turton <9107319+jnturton@users.noreply.github.com> Date: Mon, 23 May 2022 15:10:35 +0200 Subject: [PATCH] [MINOR UPDATE] Disable TestJdbcPluginWithMSSQL when not on amd64. (#2557) * [MINOR UPDATE] Disable TestJdbcPluginWithMSSQL when not on amd64. * Try using DisabledIf... instead of EnabledIf.. at class level. * Try adding EnabledIf... annotation to static setup and teardown methods. * Try adding a manual bypass to the @BeforeClass method. * Try using method-level EnabledIf... annotations. * Try to disable using os.arch = "aarch_64". * Try using org.junit.Assume instead of annotations. --- .../drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java b/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java index f451d51c222..d2eeaa5be02 100644 --- a/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java +++ b/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java @@ -29,6 +29,7 @@ import org.apache.drill.test.ClusterTest; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.AfterClass; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -41,7 +42,8 @@ import static org.junit.Assert.assertEquals; /** - * JDBC storage plugin tests against MSSQL. + * JDBC storage plugin tests against MSSQL. Note that there is no mssql container + * available on aarch64 so these tests must be disabled on that arch. */ @Category(JdbcStorageTest.class) public class TestJdbcPluginWithMSSQL extends ClusterTest { @@ -50,6 +52,8 @@ public class TestJdbcPluginWithMSSQL extends ClusterTest { @BeforeClass public static void initMSSQL() throws Exception { + Assume.assumeTrue(System.getProperty("os.arch").matches("(amd64|x86_64)")); + startCluster(ClusterFixture.builder(dirTestWatcher)); TimeZone.setDefault(TimeZone.getTimeZone("UTC"));