From 72f89d8f67e62f84788d59829a1572e6b8e474d9 Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: Nov 09 2013 18:03:12 +0000 Subject: mysql-test now reflects mysql and mysql55 on C5 --- diff --git a/tests/p_mysql/0-install_mysqld.sh b/tests/p_mysql/0-install_mysqld.sh index 2538838..03a62a4 100755 --- a/tests/p_mysql/0-install_mysqld.sh +++ b/tests/p_mysql/0-install_mysqld.sh @@ -5,12 +5,11 @@ t_Log "Running $0 - installing and starting mysql server." # MySQL -# starting with 5.10, we have to differ between mysql55 and mysql +# starting with 5.10, we have to add mysql55 if [ $centos_ver = 5 ] then - t_InstallPackage mysql55-mysql-server nc - t_ServiceControl mysql55-mysqld start >/dev/null 2>&1 + t_InstallPackage mysql55-mysql-server mysql-server nc else t_InstallPackage mysql-server nc - t_ServiceControl mysqld start >/dev/null 2>&1 fi +t_ServiceControl mysqld start diff --git a/tests/p_mysql/10_mysqld_conn_test.sh b/tests/p_mysql/10_mysqld_conn_test.sh new file mode 100755 index 0000000..41a5be3 --- /dev/null +++ b/tests/p_mysql/10_mysqld_conn_test.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +t_Log "Running $0 - mysqld client can talk to mysql server." +HostName=$(hostname -s) +MySqlHostName=$(mysql -N -B -u root -e "show variables like 'hostname'" | cut -f 2 | cut -d . -f 1) +# printing both variables for debugging purposes +echo $HostName +echo ${MySqlHostName} +if [ $HostName = ${MySqlHostName} ]; then + ret_val=0 +else + ret_val=1 +fi +t_CheckExitStatus $ret_val + +t_Log "Running $0 - mysqld listening test." +grep 'skip-networking' /etc/my.cnf > /dev/null +if [ $? -eq 1 ]; then + # FIXME: Test is very basic + nc -d -w 1 localhost 3306 >/dev/null 2>&1 + t_CheckExitStatus $? +else + t_Log "Skipped, looks like networking is disabled for mysql" +fi diff --git a/tests/p_mysql/15_mysqld_create_db.sh b/tests/p_mysql/15_mysqld_create_db.sh new file mode 100755 index 0000000..3c0b911 --- /dev/null +++ b/tests/p_mysql/15_mysqld_create_db.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# Author: Athmane Madjoudj + +t_Log "Running $0 - MySQL create database test" +mysql -u root -e 'create database mysql_test' >/dev/null 2>&1 +t_CheckExitStatus $? diff --git a/tests/p_mysql/20_mysqld_drop_db.sh b/tests/p_mysql/20_mysqld_drop_db.sh new file mode 100755 index 0000000..b1db254 --- /dev/null +++ b/tests/p_mysql/20_mysqld_drop_db.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# Author: Athmane Madjoudj + +t_Log "Running $0 - MySQL drop database test." +mysql -u root -e 'drop database mysql_test' >/dev/null 2>&1 +t_CheckExitStatus $? diff --git a/tests/p_mysql/25_mysqld_grant_test.sh b/tests/p_mysql/25_mysqld_grant_test.sh new file mode 100755 index 0000000..da21c00 --- /dev/null +++ b/tests/p_mysql/25_mysqld_grant_test.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# Author: Athmane Madjoudj + +t_Log "Running $0 - MySQL GRANT privileges test" + +mysql -u root -e 'create database mysql_test;' > /dev/null 2>&1 +mysql -u root -e "grant all on mysql_test.* to mysql_test@localhost identified by 'mysqltest'" > /dev/null 2>&1 +mysql -u root -e "flush privileges;" > /dev/null 2>&1 +mysql -u mysql_test -pmysqltest mysql_test -e 'create table test_table(id int);' > /dev/null 2>&1 +ret_val=$? + +# Clean up +mysql -u root -e 'drop database mysql_test;' > /dev/null 2>&1 + +t_CheckExitStatus $ret_val diff --git a/tests/p_mysql/50_switch_to_mysql55.sh b/tests/p_mysql/50_switch_to_mysql55.sh new file mode 100755 index 0000000..b5e1525 --- /dev/null +++ b/tests/p_mysql/50_switch_to_mysql55.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# Author: Athmane Madjoudj +# Christoph Galuschka + +t_Log "Running $0 - switching to mysql55 on C5." + +if [ $centos_ver = 5 ] +then + t_ServiceControl mysqld stop + t_ServiceControl mysql55-mysqld start +else + t_Log "This is not a C5 system - skipping" +fi diff --git a/tests/p_mysql/60_mysqld55_conn_test.sh b/tests/p_mysql/60_mysqld55_conn_test.sh new file mode 100755 index 0000000..41a5be3 --- /dev/null +++ b/tests/p_mysql/60_mysqld55_conn_test.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +t_Log "Running $0 - mysqld client can talk to mysql server." +HostName=$(hostname -s) +MySqlHostName=$(mysql -N -B -u root -e "show variables like 'hostname'" | cut -f 2 | cut -d . -f 1) +# printing both variables for debugging purposes +echo $HostName +echo ${MySqlHostName} +if [ $HostName = ${MySqlHostName} ]; then + ret_val=0 +else + ret_val=1 +fi +t_CheckExitStatus $ret_val + +t_Log "Running $0 - mysqld listening test." +grep 'skip-networking' /etc/my.cnf > /dev/null +if [ $? -eq 1 ]; then + # FIXME: Test is very basic + nc -d -w 1 localhost 3306 >/dev/null 2>&1 + t_CheckExitStatus $? +else + t_Log "Skipped, looks like networking is disabled for mysql" +fi diff --git a/tests/p_mysql/65_mysqld55_create_db.sh b/tests/p_mysql/65_mysqld55_create_db.sh new file mode 100755 index 0000000..3c0b911 --- /dev/null +++ b/tests/p_mysql/65_mysqld55_create_db.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# Author: Athmane Madjoudj + +t_Log "Running $0 - MySQL create database test" +mysql -u root -e 'create database mysql_test' >/dev/null 2>&1 +t_CheckExitStatus $? diff --git a/tests/p_mysql/70_mysqld55_drop_db.sh b/tests/p_mysql/70_mysqld55_drop_db.sh new file mode 100755 index 0000000..b1db254 --- /dev/null +++ b/tests/p_mysql/70_mysqld55_drop_db.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# Author: Athmane Madjoudj + +t_Log "Running $0 - MySQL drop database test." +mysql -u root -e 'drop database mysql_test' >/dev/null 2>&1 +t_CheckExitStatus $? diff --git a/tests/p_mysql/75_mysqld55_grant_test.sh b/tests/p_mysql/75_mysqld55_grant_test.sh new file mode 100755 index 0000000..da21c00 --- /dev/null +++ b/tests/p_mysql/75_mysqld55_grant_test.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# Author: Athmane Madjoudj + +t_Log "Running $0 - MySQL GRANT privileges test" + +mysql -u root -e 'create database mysql_test;' > /dev/null 2>&1 +mysql -u root -e "grant all on mysql_test.* to mysql_test@localhost identified by 'mysqltest'" > /dev/null 2>&1 +mysql -u root -e "flush privileges;" > /dev/null 2>&1 +mysql -u mysql_test -pmysqltest mysql_test -e 'create table test_table(id int);' > /dev/null 2>&1 +ret_val=$? + +# Clean up +mysql -u root -e 'drop database mysql_test;' > /dev/null 2>&1 + +t_CheckExitStatus $ret_val diff --git a/tests/p_mysql/mysqld_conn_test.sh b/tests/p_mysql/mysqld_conn_test.sh deleted file mode 100755 index 41a5be3..0000000 --- a/tests/p_mysql/mysqld_conn_test.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -t_Log "Running $0 - mysqld client can talk to mysql server." -HostName=$(hostname -s) -MySqlHostName=$(mysql -N -B -u root -e "show variables like 'hostname'" | cut -f 2 | cut -d . -f 1) -# printing both variables for debugging purposes -echo $HostName -echo ${MySqlHostName} -if [ $HostName = ${MySqlHostName} ]; then - ret_val=0 -else - ret_val=1 -fi -t_CheckExitStatus $ret_val - -t_Log "Running $0 - mysqld listening test." -grep 'skip-networking' /etc/my.cnf > /dev/null -if [ $? -eq 1 ]; then - # FIXME: Test is very basic - nc -d -w 1 localhost 3306 >/dev/null 2>&1 - t_CheckExitStatus $? -else - t_Log "Skipped, looks like networking is disabled for mysql" -fi diff --git a/tests/p_mysql/mysqld_create_db.sh b/tests/p_mysql/mysqld_create_db.sh deleted file mode 100755 index 3c0b911..0000000 --- a/tests/p_mysql/mysqld_create_db.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# Author: Athmane Madjoudj - -t_Log "Running $0 - MySQL create database test" -mysql -u root -e 'create database mysql_test' >/dev/null 2>&1 -t_CheckExitStatus $? diff --git a/tests/p_mysql/mysqld_drop_db.sh b/tests/p_mysql/mysqld_drop_db.sh deleted file mode 100755 index b1db254..0000000 --- a/tests/p_mysql/mysqld_drop_db.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# Author: Athmane Madjoudj - -t_Log "Running $0 - MySQL drop database test." -mysql -u root -e 'drop database mysql_test' >/dev/null 2>&1 -t_CheckExitStatus $? diff --git a/tests/p_mysql/mysqld_grant_test.sh b/tests/p_mysql/mysqld_grant_test.sh deleted file mode 100755 index da21c00..0000000 --- a/tests/p_mysql/mysqld_grant_test.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Author: Athmane Madjoudj - -t_Log "Running $0 - MySQL GRANT privileges test" - -mysql -u root -e 'create database mysql_test;' > /dev/null 2>&1 -mysql -u root -e "grant all on mysql_test.* to mysql_test@localhost identified by 'mysqltest'" > /dev/null 2>&1 -mysql -u root -e "flush privileges;" > /dev/null 2>&1 -mysql -u mysql_test -pmysqltest mysql_test -e 'create table test_table(id int);' > /dev/null 2>&1 -ret_val=$? - -# Clean up -mysql -u root -e 'drop database mysql_test;' > /dev/null 2>&1 - -t_CheckExitStatus $ret_val