Merge pull request #627 from brianfrankcooper/revert-626-accumulo-windows

Revert "[accumulo] don't run Accumulo tests on windows build."
This commit is contained in:
Kevin Risden 2016-02-22 07:37:05 -06:00
Родитель 71dfb5d2ce 678486042a
Коммит c4d0074248
1 изменённых файлов: 0 добавлений и 9 удалений

Просмотреть файл

@ -21,7 +21,6 @@ package com.yahoo.ycsb.db.accumulo;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Properties; import java.util.Properties;
@ -71,16 +70,8 @@ public class AccumuloTest {
private DB client; private DB client;
private Properties workloadProps; private Properties workloadProps;
private static boolean isWindows() {
final String os = System.getProperty("os.name");
return os.startsWith("Windows");
}
@BeforeClass @BeforeClass
public static void setup() throws Exception { public static void setup() throws Exception {
// Minicluster setup fails on Windows with an UnsatisfiedLinkError.
// Skip if windows.
assumeTrue(!isWindows());
cluster = new MiniAccumuloCluster(workingDir.newFolder("accumulo").getAbsoluteFile(), "protectyaneck"); cluster = new MiniAccumuloCluster(workingDir.newFolder("accumulo").getAbsoluteFile(), "protectyaneck");
LOG.debug("starting minicluster"); LOG.debug("starting minicluster");
cluster.start(); cluster.start();