Repository: accumulo Updated Branches: refs/heads/master 0788cb5eb -> ab5a867f1
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java b/test/src/test/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java index 11d3e43..745326e 100644 --- a/test/src/test/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java +++ b/test/src/test/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java @@ -48,7 +48,7 @@ import org.apache.accumulo.proxy.thrift.Durability; import org.apache.accumulo.proxy.thrift.TimeType; import org.apache.accumulo.proxy.thrift.WriterOptions; import org.apache.accumulo.server.util.PortUtils; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.apache.thrift.protocol.TJSONProtocol; @@ -58,7 +58,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; import com.google.common.net.HostAndPort; -public class ProxyDurabilityIT extends ConfigurableMacIT { +public class ProxyDurabilityIT extends ConfigurableMacBase { @Override protected int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java index 8359c7f..9797d7b 100644 --- a/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java +++ b/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java @@ -62,7 +62,7 @@ import org.apache.accumulo.core.util.ByteBufferUtil; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint; import org.apache.accumulo.harness.MiniClusterHarness; -import org.apache.accumulo.harness.SharedMiniClusterIT; +import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.harness.TestingKdc; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.proxy.Proxy; @@ -128,7 +128,7 @@ import com.google.common.net.HostAndPort; /** * Call every method on the proxy and try to verify that it works. */ -public abstract class SimpleProxyBase extends SharedMiniClusterIT { +public abstract class SimpleProxyBase extends SharedMiniClusterBase { private static final Logger log = LoggerFactory.getLogger(SimpleProxyBase.class); @Override @@ -156,7 +156,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { } private static boolean isKerberosEnabled() { - return SharedMiniClusterIT.TRUE.equals(System.getProperty(MiniClusterHarness.USE_KERBEROS_FOR_IT_OPTION)); + return SharedMiniClusterBase.TRUE.equals(System.getProperty(MiniClusterHarness.USE_KERBEROS_FOR_IT_OPTION)); } /** @@ -165,7 +165,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { public static void setUpProxy() throws Exception { assertNotNull("Implementations must initialize the TProtocolFactory", factory); - Connector c = SharedMiniClusterIT.getConnector(); + Connector c = SharedMiniClusterBase.getConnector(); Instance inst = c.getInstance(); waitForAccumulo(c); @@ -210,14 +210,14 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { } else { clientPrincipal = "root"; tokenClass = PasswordToken.class.getName(); - properties.put("password", SharedMiniClusterIT.getRootPassword()); + properties.put("password", SharedMiniClusterBase.getRootPassword()); hostname = "localhost"; } props.put("tokenClass", tokenClass); - ClientConfiguration clientConfig = SharedMiniClusterIT.getCluster().getClientConfig(); - String clientConfPath = new File(SharedMiniClusterIT.getCluster().getConfig().getConfDir(), "client.conf").getAbsolutePath(); + ClientConfiguration clientConfig = SharedMiniClusterBase.getCluster().getClientConfig(); + String clientConfPath = new File(SharedMiniClusterBase.getCluster().getConfig().getConfDir(), "client.conf").getAbsolutePath(); props.put("clientConfigurationFile", clientConfPath); properties.put("clientConfigurationFile", clientConfPath); @@ -273,7 +273,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { creds = client.login("root", properties); // Create 'user' - client.createLocalUser(creds, "user", s2bb(SharedMiniClusterIT.getRootPassword())); + client.createLocalUser(creds, "user", s2bb(SharedMiniClusterBase.getRootPassword())); // Log in as 'user' badLogin = client.login("user", properties); // Drop 'user', invalidating the credentials @@ -483,7 +483,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { if (!isKerberosEnabled()) { try { // Not really a relevant test for kerberos - client.authenticateUser(badLogin, "root", s2pp(SharedMiniClusterIT.getRootPassword())); + client.authenticateUser(badLogin, "root", s2pp(SharedMiniClusterBase.getRootPassword())); fail("Expected AccumuloSecurityException"); } catch (AccumuloSecurityException e) { // Expected @@ -620,7 +620,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { @Test(expected = AccumuloSecurityException.class, timeout = 5000) public void importDirectoryLoginFailure() throws Exception { - MiniAccumuloClusterImpl cluster = SharedMiniClusterIT.getCluster(); + MiniAccumuloClusterImpl cluster = SharedMiniClusterBase.getCluster(); Path base = cluster.getTemporaryPath(); Path importDir = new Path(base, "importDir"); Path failuresDir = new Path(base, "failuresDir"); @@ -739,7 +739,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { fail("exception not thrown"); } catch (TableNotFoundException ex) {} try { - MiniAccumuloClusterImpl cluster = SharedMiniClusterIT.getCluster(); + MiniAccumuloClusterImpl cluster = SharedMiniClusterBase.getCluster(); Path base = cluster.getTemporaryPath(); Path importDir = new Path(base, "importDir"); Path failuresDir = new Path(base, "failuresDir"); @@ -959,7 +959,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { @Test public void testSiteConfiguration() throws Exception { // get something we know is in the site config - MiniAccumuloClusterImpl cluster = SharedMiniClusterIT.getCluster(); + MiniAccumuloClusterImpl cluster = SharedMiniClusterBase.getCluster(); Map<String,String> cfg = client.getSiteConfiguration(creds); assertTrue(cfg.get("instance.dfs.dir").startsWith(cluster.getConfig().getAccumuloDir().getAbsolutePath())); } @@ -1150,7 +1150,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { // Can't really authenticate "badly" at the application level w/ kerberos. It's going to fail to even set up an RPC } else { // check password - assertTrue(client.authenticateUser(creds, "root", s2pp(SharedMiniClusterIT.getRootPassword()))); + assertTrue(client.authenticateUser(creds, "root", s2pp(SharedMiniClusterBase.getRootPassword()))); assertFalse(client.authenticateUser(creds, "root", s2pp(""))); } } @@ -1672,7 +1672,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { assertScan(expected, table); // export/import - MiniAccumuloClusterImpl cluster = SharedMiniClusterIT.getCluster(); + MiniAccumuloClusterImpl cluster = SharedMiniClusterBase.getCluster(); FileSystem fs = cluster.getFileSystem(); Path base = cluster.getTemporaryPath(); Path dir = new Path(base, "test"); @@ -1750,7 +1750,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT { @Test public void bulkImport() throws Exception { - MiniAccumuloClusterImpl cluster = SharedMiniClusterIT.getCluster(); + MiniAccumuloClusterImpl cluster = SharedMiniClusterBase.getCluster(); FileSystem fs = cluster.getFileSystem(); Path base = cluster.getTemporaryPath(); Path dir = new Path(base, "test"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java index 25061c9..3a1d413 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java @@ -48,7 +48,7 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ProcessReference; import org.apache.accumulo.minicluster.impl.ZooKeeperBindException; import org.apache.accumulo.server.replication.ReplicaSystemFactory; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.tserver.TabletServer; import org.apache.accumulo.tserver.replication.AccumuloReplicaSystem; import org.apache.commons.io.FileUtils; @@ -158,7 +158,7 @@ public class CyclicReplicationIT { master1Cfg.setInstanceName("master1"); // Set up SSL if needed - ConfigurableMacIT.configureForEnvironment(master1Cfg, this.getClass(), ConfigurableMacIT.getSslDir(master1Dir)); + ConfigurableMacBase.configureForEnvironment(master1Cfg, this.getClass(), ConfigurableMacBase.getSslDir(master1Dir)); master1Cfg.setProperty(Property.REPLICATION_NAME, master1Cfg.getInstanceName()); master1Cfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "5M"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java b/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java index a961e78..ab142d0 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java @@ -52,7 +52,7 @@ import org.apache.accumulo.server.log.WalStateManager; import org.apache.accumulo.server.log.WalStateManager.WalState; import org.apache.accumulo.server.replication.proto.Replication.Status; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -69,7 +69,7 @@ import com.google.common.net.HostAndPort; * ACCUMULO-3302 series of tests which ensure that a WAL is prematurely closed when a TServer may still continue to use it. Checking that no tablet references a * WAL is insufficient to determine if a WAL will never be used in the future. */ -public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacIT { +public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(GarbageCollectorCommunicatesWithTServersIT.class); private final int GC_PERIOD_SECONDS = 1; @@ -367,7 +367,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacI conn.tableOperations().flush(otherTable, null, null, true); // Get the tservers which the master deems as active - final ClientContext context = new ClientContext(conn.getInstance(), new Credentials("root", new PasswordToken(ConfigurableMacIT.ROOT_PASSWORD)), + final ClientContext context = new ClientContext(conn.getInstance(), new Credentials("root", new PasswordToken(ConfigurableMacBase.ROOT_PASSWORD)), getClientConfig()); List<String> tservers = MasterClient.execute(context, new ClientExecReturn<List<String>,MasterClientService.Client>() { @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java index be9e320..48dfdbd 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.harness.AccumuloIT; +import org.apache.accumulo.harness.AccumuloITBase; import org.apache.accumulo.harness.MiniClusterConfigurationCallback; import org.apache.accumulo.harness.MiniClusterHarness; import org.apache.accumulo.harness.TestingKdc; @@ -62,7 +62,7 @@ import com.google.common.collect.Iterators; /** * Ensure that replication occurs using keytabs instead of password (not to mention SASL) */ -public class KerberosReplicationIT extends AccumuloIT { +public class KerberosReplicationIT extends AccumuloITBase { private static final Logger log = LoggerFactory.getLogger(KerberosIT.class); private static TestingKdc kdc; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java index 8ddb914..b6888db 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java @@ -54,7 +54,7 @@ import org.apache.accumulo.minicluster.impl.ProcessReference; import org.apache.accumulo.server.replication.ReplicaSystemFactory; import org.apache.accumulo.server.replication.StatusUtil; import org.apache.accumulo.server.replication.proto.Replication.Status; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.tserver.TabletServer; import org.apache.accumulo.tserver.replication.AccumuloReplicaSystem; import org.apache.hadoop.conf.Configuration; @@ -71,7 +71,7 @@ import com.google.common.collect.Iterators; /** * Replication tests which start at least two MAC instances and replicate data between them */ -public class MultiInstanceReplicationIT extends ConfigurableMacIT { +public class MultiInstanceReplicationIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(MultiInstanceReplicationIT.class); private ExecutorService executor; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java index 6b24e99..72cb569 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java @@ -30,7 +30,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooReader; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.junit.Assert; import org.junit.Test; @@ -43,7 +43,7 @@ import com.google.common.net.HostAndPort; /** * */ -public class MultiTserverReplicationIT extends ConfigurableMacIT { +public class MultiTserverReplicationIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(MultiTserverReplicationIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java index 4a3015d..77198df 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java @@ -87,7 +87,7 @@ import org.apache.accumulo.server.replication.StatusUtil; import org.apache.accumulo.server.replication.proto.Replication.Status; import org.apache.accumulo.server.util.ReplicationTableUtil; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -111,7 +111,7 @@ import com.google.protobuf.TextFormat; * Replication tests which verify expected functionality using a single MAC instance. A MockReplicaSystem is used to "fake" the peer instance that we're * replicating to. This lets us test replication in a functional way without having to worry about two real systems. */ -public class ReplicationIT extends ConfigurableMacIT { +public class ReplicationIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(ReplicationIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/replication/ReplicationRandomWalkIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationRandomWalkIT.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationRandomWalkIT.java index 43d1f20..80bc69d 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationRandomWalkIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationRandomWalkIT.java @@ -25,13 +25,13 @@ import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.test.randomwalk.Environment; import org.apache.accumulo.test.randomwalk.concurrent.Replication; import org.apache.hadoop.conf.Configuration; import org.junit.Test; -public class ReplicationRandomWalkIT extends ConfigurableMacIT { +public class ReplicationRandomWalkIT extends ConfigurableMacBase { @Override protected void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java b/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java index 91fa8cd..b072aa7 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java @@ -37,7 +37,7 @@ import org.apache.accumulo.core.protobuf.ProtobufUtil; import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection; import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.harness.SharedMiniClusterIT; +import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.replication.StatusUtil; import org.apache.accumulo.server.replication.proto.Replication.Status; import org.apache.accumulo.server.util.ReplicationTableUtil; @@ -47,7 +47,7 @@ import org.junit.Test; import com.google.common.collect.Iterables; -public class StatusCombinerMacIT extends SharedMiniClusterIT { +public class StatusCombinerMacIT extends SharedMiniClusterBase { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java index 761d92c..88224b5 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java @@ -54,7 +54,7 @@ import org.apache.accumulo.minicluster.impl.ProcessReference; import org.apache.accumulo.server.replication.ReplicaSystemFactory; import org.apache.accumulo.server.replication.StatusUtil; import org.apache.accumulo.server.replication.proto.Replication.Status; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.tserver.TabletServer; import org.apache.accumulo.tserver.replication.AccumuloReplicaSystem; import org.apache.hadoop.conf.Configuration; @@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Iterators; -public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT { +public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(UnorderedWorkAssignerReplicationIT.class); private ExecutorService executor; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java b/test/src/test/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java index bdd5db5..59197de 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java @@ -46,7 +46,7 @@ import org.apache.accumulo.server.data.ServerMutation; import org.apache.accumulo.server.replication.ReplicaSystemFactory; import org.apache.accumulo.server.replication.StatusUtil; import org.apache.accumulo.server.replication.proto.Replication.Status; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.tserver.log.DfsLogger; import org.apache.accumulo.tserver.logger.LogEvents; import org.apache.accumulo.tserver.logger.LogFileKey; @@ -61,7 +61,7 @@ import org.junit.Test; import com.google.common.collect.Iterables; -public class UnusedWalDoesntCloseReplicationStatusIT extends ConfigurableMacIT { +public class UnusedWalDoesntCloseReplicationStatusIT extends ConfigurableMacBase { @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration coreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java b/test/src/test/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java index 7167f6a..9752916 100644 --- a/test/src/test/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java +++ b/test/src/test/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java @@ -39,10 +39,10 @@ import org.apache.accumulo.core.metadata.RootTable; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.security.SystemCredentials; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.junit.Test; -public class SystemCredentialsIT extends ConfigurableMacIT { +public class SystemCredentialsIT extends ConfigurableMacBase { private static final int FAIL_CODE = 7, BAD_PASSWD_FAIL_CODE = 8;
