Skip to content

Commit

Permalink
Try moving subclasses of BaseTestImpersonation to EasyOutOfMemory run.
Browse files Browse the repository at this point in the history
  • Loading branch information
jnturton committed Aug 15, 2023
1 parent 976e91c commit 09fbfab
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
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;
Expand Down Expand Up @@ -50,7 +51,7 @@
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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
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;
Expand Down Expand Up @@ -55,7 +56,7 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -32,7 +33,7 @@
* 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -51,7 +52,7 @@
/**
* 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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -45,7 +46,7 @@
* 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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -40,7 +41,7 @@
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];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

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;
Expand All @@ -33,7 +34,7 @@

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);
Expand Down

0 comments on commit 09fbfab

Please sign in to comment.