Merge pull request #349 from retailnext/integration_test_script_ccm_changes

Enhancements to integration.sh for ease-of-use in development

integration.sh

@@ -24,11 +24,10 @@ function run_tests() {
 	    "read_request_timeout_in_ms: 5000"
 	)
 
-	ccm create test -v binary:$version -n $clusterSize -d --vnodes
-    ccm updateconf "${conf[@]}"
+	ccm remove test || true
 
-	sed -i '/#MAX_HEAP_SIZE/c\MAX_HEAP_SIZE="256M"' ~/.ccm/repository/$version/conf/cassandra-env.sh
-	sed -i '/#HEAP_NEWSIZE/c\HEAP_NEWSIZE="100M"' ~/.ccm/repository/$version/conf/cassandra-env.sh
+	ccm create test -v binary:$version -n $clusterSize -d --vnodes --jvm_arg="-Xmx256m -XX:NewSize=100m"
+    ccm updateconf "${conf[@]}"
 
 	ccm start -v
 	ccm status
@@ -59,7 +58,7 @@ function run_tests() {
 		echo "--- FAIL: expected coverage of at least 60 %, but coverage was $cover %"
 		exit 1
 	fi
-	ccm clear
+	ccm remove
 }
 
 run_tests $1