Merge pull request apache#392 from ptnapoleon/ccm-281

olim7t · olim7t · commit 81a453887152 · 2015-07-03T09:43:51.000+02:00
Remove hardcoded check for CCM-281
diff --git a/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java b/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
@@ -191,33 +191,24 @@ private static File createTempStore(String storePath) {
     }
 
     public static CCMBridge create(String name, String... options) {
-        // This leads to a confusing CCM error message so check explicitly:
-        checkArgument(!"current".equals(name.toLowerCase()),
-            "cluster can't be called \"current\"");
         CCMBridge bridge = new CCMBridge();
         bridge.execute(CCM_COMMAND + " create %s -b -i %s %s " + Joiner.on(" ").join(options), name, IP_PREFIX, CASSANDRA_VERSION);
         return bridge;
     }
 
     public static CCMBridge create(String name, int nbNodes, String... options) {
-        checkArgument(!"current".equals(name.toLowerCase()),
-            "cluster can't be called \"current\"");
         CCMBridge bridge = new CCMBridge();
         bridge.execute(CCM_COMMAND + " create %s -n %d -s -i %s -b %s " + Joiner.on(" ").join(options), name, nbNodes, IP_PREFIX, CASSANDRA_VERSION);
         return bridge;
     }
 
     public static CCMBridge createWithCustomVersion(String name, int nbNodes, String cassandraVersion) {
-        checkArgument(!"current".equals(name.toLowerCase()),
-            "cluster can't be called \"current\"");
         CCMBridge bridge = new CCMBridge();
         bridge.execute(CCM_COMMAND + " create %s -n %d -s -i %s -b -v %s ", name, nbNodes, IP_PREFIX, cassandraVersion);
         return bridge;
     }
 
     public static CCMBridge create(String name, int nbNodesDC1, int nbNodesDC2) {
-        checkArgument(!"current".equals(name.toLowerCase()),
-            "cluster can't be called \"current\"");
         CCMBridge bridge = new CCMBridge();
         bridge.execute(CCM_COMMAND + " create %s -n %d:%d -s -i %s -b %s", name, nbNodesDC1, nbNodesDC2, IP_PREFIX, CASSANDRA_VERSION);
         return bridge;
