Projects >> accumulo >>91eb87c4891f7b04cb8777a171a4d9654463f1ee

Chunk
Conflicting content
// ACCUMULO-2361
public class DeleteTableDuringSplitIT extends SimpleMacIT {
  
<<<<<<< HEAD:test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
  Connector getConnector() throws AccumuloException, AccumuloSecurityException {
    ZooKeeperInstance zki = new ZooKeeperInstance(accumulo.getInstanceName(), accumulo.getZooKeepers());
    return zki.getConnector("root", new PasswordToken(secret));
  }
  
  String[] getTableNames(int n) {
    String[] result = new String[n];
    for (int i = 0; i < n; i++) {
      result[i] = "test_" + i;
    }
    return result;
  }
  
  @Before
  public void setUp() throws Exception {
    folder.create();
    accumulo = new MiniAccumuloCluster(folder.getRoot(), secret);
    accumulo.start();
  }
  
  @After
  public void tearDown() throws Exception {
    accumulo.stop();
    folder.delete();
  }
  

=======
>>>>>>> 6c91e3491ce87cfe06c36d10fab402a6d96cb926:test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
  @Test(timeout= 10 * 60 * 1000)
  public void test() throws Exception {
    String[] tableNames = getTableNames(100);
Solution content
// ACCUMULO-2361
public class DeleteTableDuringSplitIT extends SimpleMacIT {
  
  @Test(timeout= 10 * 60 * 1000)
  public void test() throws Exception {
    String[] tableNames = getTableNames(100);
File
DeleteTableDuringSplitIT.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration