skip cassandra.test unless cassandra is running

mysql-test/include/have_cassandra.inc

@@ -1,10 +0,0 @@
-#
-# suite.pm will make sure that all tests including this file
-# will be skipped unless innodb or xtradb is enabled
-#
-# The test below is redundant
-
-if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'cassandra' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
-{
-  --skip Test requires Cassandra.
-}

mysql-test/suite/plugins/suite.pm

@@ -2,10 +2,18 @@ package My::Suite::Plugins;
 
 @ISA = qw(My::Suite);
 
+sub cassandra_running() { 
+  return 0 if IS_WINDOW; 
+  system 'echo show version | cqlsh -3 2>/dev/null >/dev/null'; 
+  return $? == 0; 
+} 
+
 sub skip_combinations {
   my %skip;
   $skip{'t/pam.test'} = 'No pam setup for mtr'
              unless -e '/etc/pam.d/mariadb_mtr';
+  $skip{'t/cassandra.test'} = 'Cassandra is not running'
+             unless cassandra_running();
   %skip;
 }
 

mysql-test/suite/plugins/t/cassandra.test

@@ -1,7 +1,10 @@
 #
 # Tests for cassandra storage engine
 #
---source include/have_cassandra.inc
+if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'cassandra' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
+{
+  --skip Test requires Cassandra.
+}
 
 --disable_warnings
 drop table if exists t0, t1;