This is an automated email from the ASF dual-hosted git repository. dzamo pushed a commit to branch hadoop-impersonation-tests in repository https://gitbox.apache.org/repos/asf/drill.git
commit 09fbfab96b39ca779a3a1ab50ecab2399a1bb518 Author: James Turton <[email protected]> AuthorDate: Tue Aug 15 17:15:29 2023 +0200 Try moving subclasses of BaseTestImpersonation to EasyOutOfMemory run. --- .../drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java | 3 ++- .../exec/impersonation/hive/TestStorageBasedHiveAuthorization.java | 3 ++- .../drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java | 3 ++- .../org/apache/drill/exec/impersonation/TestImpersonationMetadata.java | 3 ++- .../org/apache/drill/exec/impersonation/TestImpersonationQueries.java | 3 ++- .../org/apache/drill/exec/impersonation/TestInboundImpersonation.java | 3 ++- .../drill/exec/impersonation/TestInboundImpersonationPrivileges.java | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java index 0e3c59f5dc..1622ef9d6a 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java @@ -20,6 +20,7 @@ package org.apache.drill.exec.impersonation.hive; import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; import org.apache.drill.shaded.guava.com.google.common.collect.Maps; import org.apache.drill.test.ClientFixture; +import org.apache.drill.categories.EasyOutOfMemory; import org.apache.drill.categories.HiveStorageTest; import org.apache.drill.categories.SlowTest; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; @@ -50,7 +51,7 @@ import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.METASTORE_AUTO_CREAT import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.METASTORE_EXECUTE_SET_UGI; import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.METASTORE_SCHEMA_VERIFICATION; -@Category({SlowTest.class, HiveStorageTest.class}) +@Category({SlowTest.class, HiveStorageTest.class, EasyOutOfMemory.class}) public class TestSqlStdBasedAuthorization extends BaseTestHiveImpersonation { private static final String db_general = "db_general"; diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java index c4691642eb..0c4943428b 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import org.apache.calcite.schema.Schema.TableType; +import org.apache.drill.categories.EasyOutOfMemory; import org.apache.drill.categories.HiveStorageTest; import org.apache.drill.categories.SlowTest; import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; @@ -55,7 +56,7 @@ import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.METASTORE_EXECUTE_SE import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.METASTORE_PRE_EVENT_LISTENERS; import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.METASTORE_SCHEMA_VERIFICATION; -@Category({SlowTest.class, HiveStorageTest.class}) +@Category({SlowTest.class, HiveStorageTest.class, EasyOutOfMemory.class}) public class TestStorageBasedHiveAuthorization extends BaseTestHiveImpersonation { // DB whose warehouse directory has permissions 755, available everyone to read diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java index 49e1b4a3a8..2879e2f775 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java @@ -18,6 +18,7 @@ package org.apache.drill.exec.impersonation; import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import org.apache.drill.categories.EasyOutOfMemory; import org.apache.drill.categories.SecurityTest; import org.apache.drill.exec.store.dfs.WorkspaceConfig; import org.apache.drill.categories.SlowTest; @@ -32,7 +33,7 @@ import org.junit.experimental.categories.Category; * the tests. Running this mini cluster is slow and it is best for these tests to only cover * necessary cases. */ -@Category({SlowTest.class, SecurityTest.class}) +@Category({SlowTest.class, SecurityTest.class, EasyOutOfMemory.class}) public class TestImpersonationDisabledWithMiniDFS extends BaseTestImpersonation { @BeforeClass diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java index ed25a6453a..13ecc38ccf 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java @@ -17,6 +17,7 @@ */ package org.apache.drill.exec.impersonation; +import org.apache.drill.categories.EasyOutOfMemory; import org.apache.drill.categories.SecurityTest; import org.apache.drill.categories.SlowTest; import org.apache.drill.categories.UnlikelyTest; @@ -51,7 +52,7 @@ import static org.junit.Assert.assertTrue; /** * Tests impersonation on metadata related queries as SHOW FILES, SHOW TABLES, CREATE VIEW, CREATE TABLE and DROP TABLE */ -@Category({SlowTest.class, SecurityTest.class}) +@Category({SlowTest.class, SecurityTest.class, EasyOutOfMemory.class}) public class TestImpersonationMetadata extends BaseTestImpersonation { private static final String user1 = "drillTestUser1"; private static final String user2 = "drillTestUser2"; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java index fcaeac246c..9616a9ae25 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java @@ -17,6 +17,7 @@ */ package org.apache.drill.exec.impersonation; +import org.apache.drill.categories.EasyOutOfMemory; import org.apache.drill.categories.SecurityTest; import org.apache.drill.categories.SlowTest; import org.apache.drill.common.exceptions.UserRemoteException; @@ -45,7 +46,7 @@ import static org.junit.Assert.assertNull; * Test queries involving direct impersonation and multilevel impersonation including join queries where each side is * a nested view. */ -@Category({SlowTest.class, SecurityTest.class}) +@Category({SlowTest.class, SecurityTest.class, EasyOutOfMemory.class}) public class TestImpersonationQueries extends BaseTestImpersonation { @BeforeClass public static void setup() throws Exception { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java index 18b1684a93..5633109bb2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java @@ -17,6 +17,7 @@ */ package org.apache.drill.exec.impersonation; +import org.apache.drill.categories.EasyOutOfMemory; import org.apache.drill.categories.SecurityTest; import org.apache.drill.categories.SlowTest; import org.apache.drill.common.config.DrillProperties; @@ -40,7 +41,7 @@ import static org.apache.drill.exec.rpc.user.security.testing.UserAuthenticatorT import static org.apache.drill.exec.rpc.user.security.testing.UserAuthenticatorTestImpl.PROCESS_USER_PASSWORD; import static org.apache.drill.exec.rpc.user.security.testing.UserAuthenticatorTestImpl.TYPE; -@Category({SlowTest.class, SecurityTest.class}) +@Category({SlowTest.class, SecurityTest.class, EasyOutOfMemory.class}) public class TestInboundImpersonation extends BaseTestImpersonation { public static final String OWNER = org1Users[0]; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java index 00ac0abaed..a229b7506d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java @@ -19,6 +19,7 @@ package org.apache.drill.exec.impersonation; import org.apache.drill.shaded.guava.com.google.common.base.Charsets; import org.apache.drill.shaded.guava.com.google.common.io.Files; +import org.apache.drill.categories.EasyOutOfMemory; import org.apache.drill.categories.SecurityTest; import org.apache.drill.common.util.DrillFileUtils; import org.apache.drill.exec.ExecConstants; @@ -33,7 +34,7 @@ import java.io.IOException; import static org.junit.Assert.assertEquals; -@Category(SecurityTest.class) +@Category({SecurityTest.class, EasyOutOfMemory.class}) public class TestInboundImpersonationPrivileges extends BaseTestImpersonation { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestInboundImpersonationPrivileges.class);
