Browse Source

Fix buildbot failure:

Backport the code that runs cassandra.test only when Cassandra is 
present and running from 10.0 to 10.0-base.
pull/57/head
Sergey Petrunya 13 years ago
parent
commit
62222eb518
  1. 10
      mysql-test/include/have_cassandra.inc
  2. 0
      mysql-test/suite/plugins/r/cassandra.result
  3. 11
      mysql-test/suite/plugins/suite.pm
  4. 0
      mysql-test/suite/plugins/t/cassandra.opt
  5. 5
      mysql-test/suite/plugins/t/cassandra.test

10
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.
}

0
mysql-test/r/cassandra.result → mysql-test/suite/plugins/r/cassandra.result

11
mysql-test/suite/plugins/suite.pm

@ -1,11 +1,22 @@
package My::Suite::Plugins;
use My::Platform;
@ISA = qw(My::Suite);
sub cassandra_running() {
return 0 if IS_WINDOWS;
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{'t/cassandra_qcache.test'} = $skip{'t/cassandra.test'};
%skip;
}

0
mysql-test/include/have_cassandra.opt → mysql-test/suite/plugins/t/cassandra.opt

5
mysql-test/t/cassandra.test → 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;
Loading…
Cancel
Save