This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 41792a48ee Shared mini test suite (#5536)
41792a48ee is described below
commit 41792a48ee1e84784aefa3ea0520a17765c77ff0
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu May 15 07:47:48 2025 -0400
Shared mini test suite (#5536)
Created SimpleSharedMacTestSuite which starts Mini, runs all of the tests
with
the SIMPLE_MINI_CLUSTER_SUITE tag, then shuts down Mini. Annotated most of
the tests that extended SharedMiniClusterBase and called startMiniCluster
with
no configuration callback with the SIMPLE_MINI_CLUSTER_SUITE tag. These
tests
with that tag did not use a configuration callback where most likely to not
do
destructive things with Mini. ManagerApiIT was one exception and I did not
put
the tag on this class.
Modified SharedMiniClusterBase so that stopMiniCluster would not stop the
cluster if STOP_DISABLED was set to true, which it is in the new test suite
class.
This enables a single test class to be run and behave normally, but also
allows
the class to be part of the test suite and not shut down Mini after the
tests have
run. Modified stopMiniCluster to instead delete all user tables and
namespaces
when STOP_DISABLED is set to true to clean up tables from the test class.
Leaving
the tables around in the instance worked for most tests, but not for tests
that
counted tables and expected a certain number (CreateTableIT) or for tests
that
kicked off a compaction and waited for it to finish
(ComprehensiveIT.testCompaction)
as the single Compactor may have been busy compacting other tables.
Modified the pom to have two failsafe executions, one for the ITs without
the
SIMPLE_MINI_CLUSTER_SUITE and one for the test suite.
Closes #5529
---
pom.xml | 18 +++++++
src/build/ci/find-unapproved-junit.sh | 2 +-
test/pom.xml | 8 ++++
.../apache/accumulo/harness/AccumuloITBase.java | 1 +
.../accumulo/harness/SharedMiniClusterBase.java | 56 +++++++++++++++++++++-
.../accumulo/suites/SimpleSharedMacTestSuite.java | 52 ++++++++++++++++++++
.../org/apache/accumulo/test/AdminCheckIT.java | 3 ++
.../java/org/apache/accumulo/test/CloneIT.java | 3 ++
.../org/apache/accumulo/test/ComprehensiveIT.java | 2 +
.../org/apache/accumulo/test/CreateTableIT.java | 3 ++
.../java/org/apache/accumulo/test/GCRunIT.java | 2 +
.../accumulo/test/MultiTableBatchWriterIT.java | 3 ++
.../org/apache/accumulo/test/NamespacesIT.java | 2 +
.../accumulo/test/NewTableConfigurationIT.java | 3 ++
.../org/apache/accumulo/test/OrIteratorIT.java | 3 ++
.../java/org/apache/accumulo/test/PrintInfoIT.java | 3 ++
.../java/org/apache/accumulo/test/SampleIT.java | 3 ++
.../test/ScanServerMetadataEntriesCleanIT.java | 2 +
.../accumulo/test/ZooKeeperPropertiesIT.java | 3 ++
.../apache/accumulo/test/ample/TestAmpleIT.java | 3 ++
.../test/ample/usage/TabletFileUpdateIT.java | 3 ++
.../accumulo/test/conf/PropStoreConfigIT.java | 2 +
.../accumulo/test/conf/util/ZooPropEditorIT.java | 2 +
.../accumulo/test/fate/FateExecutionOrderIT.java | 3 ++
.../apache/accumulo/test/fate/ManagerRepoIT.java | 3 ++
.../accumulo/test/fate/user/FateMutatorImplIT.java | 3 ++
.../apache/accumulo/test/fate/user/UserFateIT.java | 3 ++
.../test/fate/user/UserFatePoolsWatcherIT.java | 3 ++
.../fate/user/UserFateStatusEnforcementIT.java | 3 ++
.../test/fate/user/UserFateStoreFateIT.java | 3 ++
.../test/fate/user/UserMultipleStoresIT.java | 3 ++
.../accumulo/test/functional/AddSplitIT.java | 3 ++
.../accumulo/test/functional/CloneTestIT.java | 3 ++
.../test/functional/DeletedTablesDontFlushIT.java | 3 ++
.../test/functional/FileNormalizationIT.java | 3 ++
.../test/functional/FindCompactionTmpFilesIT.java | 3 ++
.../accumulo/test/functional/MergeTabletsIT.java | 3 ++
.../apache/accumulo/test/shell/ConfigSetIT.java | 4 +-
.../accumulo/test/shell/ShellAuthenticatorIT.java | 3 ++
.../org/apache/accumulo/test/shell/ShellIT.java | 2 +
40 files changed, 229 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 58931ff164..eb35b6b88e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -945,6 +945,7 @@
<!-- ignore log4j dep used for annotations and needed for
compile time linting -->
<unused>biz.aQute.bnd:biz.aQute.bnd.annotation:jar:*</unused>
<unused>org.junit.jupiter:junit-jupiter-engine:jar:*</unused>
+
<unused>org.junit.platform:junit-platform-suite-engine:jar:*</unused>
</ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
@@ -1152,12 +1153,29 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
+ <execution>
+ <id>run-integration-test-suite</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <test>org.apache.accumulo.suites.SimpleSharedMacTestSuite</test>
+ </configuration>
+ </execution>
<execution>
<id>run-integration-tests</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
+ <configuration>
+ <!--
+ exclude tests that were run as part of the test suite and
+ the test suite itself
+ -->
+ <excludedGroups>SimpleMiniClusterSuite</excludedGroups>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/src/build/ci/find-unapproved-junit.sh
b/src/build/ci/find-unapproved-junit.sh
index da8ac47cb0..8802208e8e 100755
--- a/src/build/ci/find-unapproved-junit.sh
+++ b/src/build/ci/find-unapproved-junit.sh
@@ -35,7 +35,7 @@ function findalljunitproblems() {
opts='-PRlH'
fi
# find any new classes using something other than the jupiter API, except
those allowed
- grep "$opts" --include='*.java' 'org[.]junit[.](?!jupiter)' | grep -Pv
"^(${ALLOWED_PIPE_SEP//./[.]})\$"
+ grep "$opts" --include='*.java'
'org[.]junit[.](?!(jupiter|platform[.]suite)' | grep -Pv
"^(${ALLOWED_PIPE_SEP//./[.]})\$"
if ((${#ALLOWED[@]} != 0)); then
# find any uses of the jupiter API in the allowed vintage classes
grep "$opts" 'org[.]junit[.]jupiter' "${ALLOWED[@]}"
diff --git a/test/pom.xml b/test/pom.xml
index a02d7fadb9..41ba33ab3b 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -198,6 +198,14 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-suite-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-suite-engine</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
b/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
index c218f41c20..41c49a9cbe 100644
--- a/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
+++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
@@ -50,6 +50,7 @@ public class AccumuloITBase extends WithTestNames {
public static final String SUNNY_DAY = "SunnyDay";
public static final String MINI_CLUSTER_ONLY = "MiniClusterOnly";
public static final String ZOOKEEPER_TESTING_SERVER =
"ZooKeeperTestingServer";
+ public static final String SIMPLE_MINI_CLUSTER_SUITE =
"SimpleMiniClusterSuite";
protected <T> T getOnlyElement(Collection<T> c) {
return c.stream().collect(onlyElement());
diff --git
a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java
b/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java
index 360ecbc931..68ab06201e 100644
--- a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java
+++ b/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java
@@ -28,16 +28,25 @@ import java.lang.StackWalker.StackFrame;
import java.nio.file.Path;
import java.util.Optional;
import java.util.Properties;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Stream;
import org.apache.accumulo.cluster.ClusterUser;
import org.apache.accumulo.cluster.ClusterUsers;
+import org.apache.accumulo.core.client.Accumulo;
+import org.apache.accumulo.core.client.AccumuloClient;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.NamespaceNotEmptyException;
+import org.apache.accumulo.core.client.NamespaceNotFoundException;
+import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.clientImpl.ClientInfo;
+import org.apache.accumulo.core.clientImpl.Namespace;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl;
import org.apache.hadoop.conf.Configuration;
@@ -67,6 +76,7 @@ import org.slf4j.LoggerFactory;
public abstract class SharedMiniClusterBase extends AccumuloITBase implements
ClusterUsers {
private static final Logger log =
LoggerFactory.getLogger(SharedMiniClusterBase.class);
public static final String TRUE = Boolean.toString(true);
+ protected static final AtomicBoolean STOP_DISABLED = new
AtomicBoolean(false);
private static String rootPassword;
private static AuthenticationToken token;
@@ -86,8 +96,12 @@ public abstract class SharedMiniClusterBase extends
AccumuloITBase implements Cl
*
* @param miniClusterCallback A callback to configure the minicluster before
it is started.
*/
- public static void startMiniClusterWithConfig(
+ public static synchronized void startMiniClusterWithConfig(
MiniClusterConfigurationCallback miniClusterCallback) throws Exception {
+ if (cluster != null) {
+ return;
+ }
+
File baseDir = Path.of(System.getProperty("user.dir") +
"/target/mini-tests").toFile();
assertTrue(baseDir.mkdirs() || baseDir.isDirectory());
@@ -132,10 +146,48 @@ public abstract class SharedMiniClusterBase extends
AccumuloITBase implements Cl
/**
* Stops the MiniAccumuloCluster and related services if they are running.
*/
- public static void stopMiniCluster() {
+ public static synchronized void stopMiniCluster() {
+ if (STOP_DISABLED.get()) {
+ // If stop is disabled, then we are likely running a
+ // test class that is part of a larger suite. We don't
+ // want to shut down the cluster, but we should clean
+ // up any tables that were created, but not deleted,
+ // by the test class. This will prevent issues with
+ // subsequent tests that count objects or initiate
+ // compactions and wait for them, but some other table
+ // from a prior test is compacting.
+ try (AccumuloClient client =
Accumulo.newClient().from(getClientProps()).build()) {
+ for (String tableName : client.tableOperations().list()) {
+ if (!tableName.startsWith(Namespace.ACCUMULO.name() + ".")) {
+ try {
+ client.tableOperations().delete(tableName);
+ } catch (AccumuloException | AccumuloSecurityException |
TableNotFoundException e) {
+ log.error("Error deleting table {}", tableName, e);
+ }
+ }
+ }
+ try {
+ for (String namespaceName : client.namespaceOperations().list()) {
+ if (!namespaceName.equals(Namespace.ACCUMULO.name())
+ && !namespaceName.equals(Namespace.DEFAULT.name())) {
+ try {
+ client.namespaceOperations().delete(namespaceName);
+ } catch (AccumuloException | AccumuloSecurityException |
NamespaceNotFoundException
+ | NamespaceNotEmptyException e) {
+ log.error("Error deleting namespace {}", namespaceName, e);
+ }
+ }
+ }
+ } catch (AccumuloSecurityException | AccumuloException e) {
+ log.error("Error listing namespaces", e);
+ }
+ }
+ return;
+ }
if (cluster != null) {
try {
cluster.stop();
+ cluster = null;
} catch (Exception e) {
log.error("Failed to stop minicluster", e);
}
diff --git
a/test/src/main/java/org/apache/accumulo/suites/SimpleSharedMacTestSuite.java
b/test/src/main/java/org/apache/accumulo/suites/SimpleSharedMacTestSuite.java
new file mode 100644
index 0000000000..fdd36fd998
--- /dev/null
+++
b/test/src/main/java/org/apache/accumulo/suites/SimpleSharedMacTestSuite.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.suites;
+
+import static
org.apache.accumulo.harness.AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE;
+
+import org.apache.accumulo.harness.SharedMiniClusterBase;
+import org.junit.platform.suite.api.AfterSuite;
+import org.junit.platform.suite.api.BeforeSuite;
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
+import org.junit.platform.suite.api.IncludeTags;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectPackages("org.apache.accumulo.test") // look in this package and
subpackages
+@IncludeTags(SIMPLE_MINI_CLUSTER_SUITE) // for tests with this tag
+@IncludeClassNamePatterns(".*IT") // need to override the default pattern
".*Test"
+public class SimpleSharedMacTestSuite extends SharedMiniClusterBase {
+
+ @BeforeSuite
+ public static void beforeAllTests() throws Exception {
+ SharedMiniClusterBase.startMiniCluster();
+
+ // Disable tests that are run as part of this suite
+ // from stopping MiniAccumuloCluster in there JUnit
+ // lifecycle methods (e.g. AfterEach, AfterAll)
+ SharedMiniClusterBase.STOP_DISABLED.set(true);
+ }
+
+ @AfterSuite
+ public static void afterAllTests() throws Exception {
+ SharedMiniClusterBase.STOP_DISABLED.set(false);
+ SharedMiniClusterBase.stopMiniCluster();
+ }
+}
diff --git a/test/src/main/java/org/apache/accumulo/test/AdminCheckIT.java
b/test/src/main/java/org/apache/accumulo/test/AdminCheckIT.java
index 13b0cbf410..92b749ba80 100644
--- a/test/src/main/java/org/apache/accumulo/test/AdminCheckIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/AdminCheckIT.java
@@ -40,6 +40,7 @@ import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.admin.CompactionConfig;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.cli.ServerUtilOpts;
@@ -52,11 +53,13 @@ import org.easymock.IAnswer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.beust.jcommander.JCommander;
import com.google.common.collect.Sets;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class AdminCheckIT extends SharedMiniClusterBase {
@BeforeAll
diff --git a/test/src/main/java/org/apache/accumulo/test/CloneIT.java
b/test/src/main/java/org/apache/accumulo/test/CloneIT.java
index d00d77bd2f..e8934b5862 100644
--- a/test/src/main/java/org/apache/accumulo/test/CloneIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CloneIT.java
@@ -44,12 +44,14 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Se
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
import org.apache.accumulo.core.metadata.schema.TabletDeletedException;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
@@ -57,6 +59,7 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class CloneIT extends SharedMiniClusterBase {
@BeforeAll
diff --git a/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java
b/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java
index 51557edac8..9595fd9667 100644
--- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java
@@ -22,12 +22,14 @@ import static
org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
@Tag(SUNNY_DAY)
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class ComprehensiveIT extends ComprehensiveBaseIT {
@BeforeAll
public static void setup() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/CreateTableIT.java
b/test/src/main/java/org/apache/accumulo/test/CreateTableIT.java
index 8c3fd77d7f..f9ae5c529d 100644
--- a/test/src/main/java/org/apache/accumulo/test/CreateTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CreateTableIT.java
@@ -31,13 +31,16 @@ import
org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.metadata.SystemTables;
import org.apache.accumulo.core.util.Timer;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class CreateTableIT extends SharedMiniClusterBase {
private static final Logger log =
LoggerFactory.getLogger(CreateTableIT.class);
public static final int NUM_TABLES = 500;
diff --git a/test/src/main/java/org/apache/accumulo/test/GCRunIT.java
b/test/src/main/java/org/apache/accumulo/test/GCRunIT.java
index 599811c95c..d3b49cc2fd 100644
--- a/test/src/main/java/org/apache/accumulo/test/GCRunIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/GCRunIT.java
@@ -45,6 +45,7 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema;
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.gc.GCRun;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.hadoop.io.Text;
@@ -57,6 +58,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag(MINI_CLUSTER_ONLY)
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class GCRunIT extends SharedMiniClusterBase {
public static final Logger log = LoggerFactory.getLogger(GCRunIT.class);
diff --git
a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
index 4a483eca73..7411c69240 100644
--- a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
@@ -41,15 +41,18 @@ import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.google.common.collect.Maps;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class MultiTableBatchWriterIT extends SharedMiniClusterBase {
@BeforeAll
diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
index b9053adc43..81aca7658e 100644
--- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
@@ -79,6 +79,7 @@ import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.util.tables.TableNameUtil;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.constraints.NumericValueConstraint;
import org.apache.commons.lang3.StringUtils;
@@ -95,6 +96,7 @@ import org.junit.jupiter.api.function.Executable;
* Test different namespace permissions
*/
@Tag(MINI_CLUSTER_ONLY)
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class NamespacesIT extends SharedMiniClusterBase {
private AccumuloClient c;
diff --git
a/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
b/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
index 999c1f0c9a..09d30333e6 100644
--- a/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
@@ -48,12 +48,15 @@ import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class NewTableConfigurationIT extends SharedMiniClusterBase {
@Override
diff --git a/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
b/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
index 05c1ba8871..0c9e27d2c3 100644
--- a/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
@@ -46,12 +46,15 @@ import org.apache.accumulo.core.data.PartialKey;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.OrIterator;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class OrIteratorIT extends SharedMiniClusterBase {
@BeforeAll
diff --git a/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
b/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
index 641899d674..b5d35c9ea3 100644
--- a/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
@@ -41,14 +41,17 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.file.rfile.PrintInfo;
import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl;
import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class PrintInfoIT extends SharedMiniClusterBase {
@BeforeAll
diff --git a/test/src/main/java/org/apache/accumulo/test/SampleIT.java
b/test/src/main/java/org/apache/accumulo/test/SampleIT.java
index 928ad740f9..3c55b361aa 100644
--- a/test/src/main/java/org/apache/accumulo/test/SampleIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/SampleIT.java
@@ -66,15 +66,18 @@ import
org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.iterators.WrappingIterator;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.util.FileMetadataUtil;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.google.common.collect.Iterables;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class SampleIT extends SharedMiniClusterBase {
@BeforeAll
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
index 7e06a43872..28628a7e3e 100644
---
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
@@ -28,6 +28,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.accumulo.core.metadata.ScanServerRefTabletFile;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.util.ScanServerMetadataEntries;
@@ -39,6 +40,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.net.HostAndPort;
@Tag(MINI_CLUSTER_ONLY)
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class ScanServerMetadataEntriesCleanIT extends SharedMiniClusterBase {
@BeforeAll
diff --git
a/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT.java
b/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT.java
index d5e93c515c..547642c6cf 100644
--- a/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT.java
@@ -36,6 +36,7 @@ import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.conf.store.NamespacePropKey;
@@ -43,9 +44,11 @@ import org.apache.accumulo.server.conf.store.TablePropKey;
import org.apache.accumulo.server.util.PropUtil;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class ZooKeeperPropertiesIT extends SharedMiniClusterBase {
@BeforeAll
diff --git a/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java
b/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java
index 4559301235..b6baba3b58 100644
--- a/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java
@@ -38,17 +38,20 @@ import
org.apache.accumulo.core.metadata.schema.Ample.ConditionalResult.Status;
import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
import org.apache.accumulo.core.metadata.schema.TabletOperationId;
import org.apache.accumulo.core.metadata.schema.TabletOperationType;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.ample.metadata.TestAmple;
import org.apache.accumulo.test.ample.metadata.TestAmple.TestServerAmpleImpl;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import com.google.common.base.Preconditions;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class TestAmpleIT extends SharedMiniClusterBase {
@BeforeAll
diff --git
a/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT.java
b/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT.java
index abc9242b58..8370de1b33 100644
---
a/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT.java
@@ -40,6 +40,7 @@ import org.apache.accumulo.core.metadata.schema.Ample;
import org.apache.accumulo.core.metadata.schema.DataFileValue;
import org.apache.accumulo.core.metadata.schema.MetadataTime;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.Location;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.tablets.TabletTime;
import org.apache.accumulo.test.ample.metadata.TestAmple;
@@ -47,12 +48,14 @@ import org.apache.accumulo.tserver.MinorCompactionReason;
import org.apache.hadoop.fs.Path;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
/**
* Tests tablet usage of ample to add a new minor compacted file to tablet.
This tests edge cases,
* the normal cases are well tested by many other ITs from simply running
Accumulo.
*/
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class TabletFileUpdateIT extends SharedMiniClusterBase {
@BeforeAll
diff --git
a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
index d7720b9f14..5bb1303e1f 100644
--- a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
@@ -48,6 +48,7 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.trace.TraceUtil;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.conf.store.NamespacePropKey;
@@ -63,6 +64,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag(MINI_CLUSTER_ONLY)
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class PropStoreConfigIT extends SharedMiniClusterBase {
private static final Logger log =
LoggerFactory.getLogger(PropStoreConfigIT.class);
diff --git
a/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT.java
b/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT.java
index dcd57ec5e7..e9d109f1f9 100644
--- a/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT.java
@@ -24,6 +24,7 @@ import java.time.Duration;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.conf.util.ZooPropEditor;
import org.apache.accumulo.test.util.Wait;
@@ -35,6 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag(MINI_CLUSTER_ONLY)
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class ZooPropEditorIT extends SharedMiniClusterBase {
private static final Logger LOG =
LoggerFactory.getLogger(ZooPropEditorIT.class);
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
index da3b76a242..ddf484c271 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
@@ -55,16 +55,19 @@ import org.apache.accumulo.core.fate.Fate.TxInfo;
import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateStore;
import org.apache.accumulo.core.fate.Repo;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.google.common.collect.Iterators;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public abstract class FateExecutionOrderIT extends SharedMiniClusterBase
implements FateTestRunner<FateExecutionOrderIT.FeoTestEnv> {
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
index 59548cc738..591e3cd2aa 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
@@ -74,6 +74,7 @@ import
org.apache.accumulo.core.metadata.schema.TabletsMetadata;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.time.SteadyTime;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.manager.Manager;
import
org.apache.accumulo.manager.merge.FindMergeableRangeTask.UnmergeableReason;
@@ -97,6 +98,7 @@ import
org.apache.accumulo.test.ample.metadata.TestAmple.TestServerAmpleImpl;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
@@ -104,6 +106,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import com.google.common.collect.Sets;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class ManagerRepoIT extends SharedMiniClusterBase {
@BeforeAll
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT.java
index 1d80a5fb9b..bdfb5ac2a0 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT.java
@@ -38,14 +38,17 @@ import org.apache.accumulo.core.fate.ReadOnlyFateStore;
import org.apache.accumulo.core.fate.user.FateMutator;
import org.apache.accumulo.core.fate.user.FateMutatorImpl;
import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.fate.FateIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class FateMutatorImplIT extends SharedMiniClusterBase {
Logger log = LoggerFactory.getLogger(FateMutatorImplIT.class);
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
index 30d45fedfb..c53a6ff91d 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
@@ -40,13 +40,16 @@ import org.apache.accumulo.core.fate.user.schema.FateSchema;
import org.apache.accumulo.core.iterators.user.VersioningIterator;
import org.apache.accumulo.core.metadata.SystemTables;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.test.fate.FateIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class UserFateIT extends FateIT {
private String table;
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT.java
index 67f5cfb1b0..8fdb3e6e8a 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT.java
@@ -25,11 +25,14 @@ import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.fate.AbstractFateStore;
import org.apache.accumulo.core.fate.user.UserFateStore;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.fate.FatePoolsWatcherIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class UserFatePoolsWatcherIT extends FatePoolsWatcherIT {
private String table;
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java
index d2d8c3ec12..a591c95cdd 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java
@@ -24,13 +24,16 @@ import static
org.apache.accumulo.test.fate.TestLock.createDummyLockID;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.fate.user.UserFateStore;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.fate.FateStatusEnforcementIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class UserFateStatusEnforcementIT extends FateStatusEnforcementIT {
private ClientContext client;
private String table;
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
index a112445d99..590284c62d 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
@@ -32,12 +32,15 @@ import
org.apache.accumulo.core.fate.AbstractFateStore.FateIdGenerator;
import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.user.UserFateStore;
import org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.test.fate.FateStoreIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class UserFateStoreFateIT extends FateStoreIT {
@BeforeAll
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT.java
index dff619c01f..2c87e811ea 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT.java
@@ -30,13 +30,16 @@ import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.fate.FateStore;
import org.apache.accumulo.core.fate.user.UserFateStore;
import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.fate.MultipleStoresIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class UserMultipleStoresIT extends MultipleStoresIT {
private ClientContext client;
private String tableName;
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
index 5a72053d93..93109f0633 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
@@ -55,14 +55,17 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableMap;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class AddSplitIT extends SharedMiniClusterBase {
@BeforeAll
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
index f0e71d6424..a0a4c7b7d1 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
@@ -67,6 +67,7 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Se
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl;
import org.apache.hadoop.fs.FileStatus;
@@ -75,8 +76,10 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class CloneTestIT extends SharedMiniClusterBase {
@BeforeAll
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
index 6060f1a62c..4b5286cb8f 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
@@ -28,12 +28,15 @@ import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
// ACCUMULO-2880
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class DeletedTablesDontFlushIT extends SharedMiniClusterBase {
@Override
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT.java
index e7a9d41503..149e89b654 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT.java
@@ -40,12 +40,14 @@ import org.apache.accumulo.core.metadata.StoredTabletFile;
import org.apache.accumulo.core.metadata.SystemTables;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.VerifyIngest;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,6 +58,7 @@ import org.slf4j.LoggerFactory;
* to update the metadata table then the key will not match. The mismatch
could result in duplicate
* entries.
*/
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class FileNormalizationIT extends SharedMiniClusterBase {
private static final Logger log =
LoggerFactory.getLogger(FileNormalizationIT.class);
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT.java
index 9721c82a98..16be75fa5b 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT.java
@@ -33,6 +33,7 @@ import org.apache.accumulo.core.metadata.ReferencedTabletFile;
import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.tablets.TabletNameGenerator;
@@ -42,8 +43,10 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class FindCompactionTmpFilesIT extends SharedMiniClusterBase {
@BeforeAll
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT.java
index a637c33efc..86efc0667b 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT.java
@@ -18,10 +18,13 @@
*/
package org.apache.accumulo.test.functional;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class MergeTabletsIT extends MergeTabletsBaseIT {
@BeforeAll
diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT.java
b/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT.java
index e520683843..b00635f13d 100644
--- a/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT.java
@@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -35,6 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag(MINI_CLUSTER_ONLY)
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class ConfigSetIT extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
@@ -49,7 +51,6 @@ public class ConfigSetIT extends SharedMiniClusterBase {
private static final Logger log = LoggerFactory.getLogger(ConfigSetIT.class);
@Test
- @SuppressWarnings("deprecation")
public void setInvalidJson() throws Exception {
log.debug("Starting setInvalidJson test ------------------");
@@ -64,6 +65,7 @@ public class ConfigSetIT extends SharedMiniClusterBase {
validJson);
assertThrows(AccumuloException.class, () -> client.instanceOperations()
.setProperty(MONITOR_RESOURCES_EXTERNAL.getKey(), invalidJson));
+
client.instanceOperations().removeProperty(COMPACTION_SERVICE_DEFAULT_GROUPS.getKey());
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT.java
b/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT.java
index 8dd631adea..2969b4a1e9 100644
---
a/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT.java
@@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.TimeZone;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.shell.Shell;
import org.apache.accumulo.test.shell.ShellIT.StringInputStream;
@@ -37,8 +38,10 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class ShellAuthenticatorIT extends SharedMiniClusterBase {
@BeforeAll
diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
b/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
index ac83451c7f..84bcc72cd2 100644
--- a/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
@@ -36,6 +36,7 @@ import java.util.TimeZone;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.conf.PropertyType;
+import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.shell.Shell;
import org.jline.reader.LineReader;
@@ -53,6 +54,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag(MINI_CLUSTER_ONLY)
+@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public class ShellIT extends SharedMiniClusterBase {
@Override
