[accumulo] branch main updated: Partial revert of 66e2b1ccbae4ad46c1c59861a9c97ef4d5190f50

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller 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 eecdd59  Partial revert of 66e2b1ccbae4ad46c1c59861a9c97ef4d5190f50
eecdd59 is described below

commit eecdd59042f69243be5aba981056fe2600007608
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Sep 29 10:56:17 2020 -0400

    Partial revert of 66e2b1ccbae4ad46c1c59861a9c97ef4d5190f50
    
    * Some of the ITs that were disabled passed when the test jar was copied
    to the lib folder of the standalone instance. Removed the override of
    the canRunTest method to allow the passing ITs to run in standalone mode
---
 test/src/main/java/org/apache/accumulo/test/IteratorEnvIT.java       | 5 -----
 test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java   | 5 -----
 .../main/java/org/apache/accumulo/test/UserCompactionStrategyIT.java | 5 -----
 .../main/java/org/apache/accumulo/test/functional/CompactionIT.java  | 5 -----
 .../src/main/java/org/apache/accumulo/test/functional/SummaryIT.java | 5 -----
 5 files changed, 25 deletions(-)

diff --git a/test/src/main/java/org/apache/accumulo/test/IteratorEnvIT.java 
b/test/src/main/java/org/apache/accumulo/test/IteratorEnvIT.java
index 3dbfe5d..f64afe3 100644
--- a/test/src/main/java/org/apache/accumulo/test/IteratorEnvIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/IteratorEnvIT.java
@@ -54,11 +54,6 @@ import org.junit.Test;
 public class IteratorEnvIT extends AccumuloClusterHarness {
 
   @Override
-  public boolean canRunTest(ClusterType type) {
-    return type == ClusterType.MINI;
-  }
-
-  @Override
   public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
     cfg.setNumTservers(1);
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java 
b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
index ff1fdc6..47c4126 100644
--- a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
@@ -76,11 +76,6 @@ public class TableOperationsIT extends 
AccumuloClusterHarness {
   private AccumuloClient accumuloClient;
 
   @Override
-  public boolean canRunTest(ClusterType type) {
-    return type == ClusterType.MINI;
-  }
-
-  @Override
   public int defaultTimeoutSeconds() {
     return 90;
   }
diff --git 
a/test/src/main/java/org/apache/accumulo/test/UserCompactionStrategyIT.java 
b/test/src/main/java/org/apache/accumulo/test/UserCompactionStrategyIT.java
index af6ab21..ed198f7 100644
--- a/test/src/main/java/org/apache/accumulo/test/UserCompactionStrategyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/UserCompactionStrategyIT.java
@@ -66,11 +66,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 public class UserCompactionStrategyIT extends AccumuloClusterHarness {
 
   @Override
-  public boolean canRunTest(ClusterType type) {
-    return type == ClusterType.MINI;
-  }
-
-  @Override
   public int defaultTimeoutSeconds() {
     return 3 * 60;
   }
diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java 
b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index 5da58e6..e01fc39 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -54,11 +54,6 @@ public class CompactionIT extends AccumuloClusterHarness {
   private static final Logger log = 
LoggerFactory.getLogger(CompactionIT.class);
 
   @Override
-  public boolean canRunTest(ClusterType type) {
-    return type == ClusterType.MINI;
-  }
-
-  @Override
   public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration 
hadoopCoreSite) {
     cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s");
     cfg.setProperty(Property.TSERV_MAJC_THREAD_MAXOPEN, "4");
diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java 
b/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java
index 5ee1863..ed77986 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java
@@ -93,11 +93,6 @@ import com.google.common.collect.Lists;
 
 public class SummaryIT extends AccumuloClusterHarness {
 
-  @Override
-  public boolean canRunTest(ClusterType type) {
-    return type == ClusterType.MINI;
-  }
-
   private LongSummaryStatistics getTimestampStats(final String table, 
AccumuloClient c)
       throws TableNotFoundException {
     try (Scanner scanner = c.createScanner(table, Authorizations.EMPTY)) {