bstinson / centos / t_functional

Forked from centos/t_functional 4 years ago
Clone

269271 included mysql55 for 5.10 in the remaining tests

Authored and Committed by Christoph Galuschka 11 years ago
    included mysql55 for 5.10 in the remaining tests
    
        
tests/p_python/20-python-mysql-test.sh CHANGED
@@ -5,8 +5,15 @@
5
5
t_Log "Running $0 - python can retrieve mysql-server version information."
6
6
7
7
# we need a working and running mysql server
8
- t_InstallPackage mysql-server
9
- t_ServiceControl mysqld start >/dev/null 2>&1
8
+ # starting with 5.10, we have to differ between mysql55 and mysql
9
+ if [ $centos_ver = 5 ]
10
+ then
11
+ t_InstallPackage mysql55-mysql-server
12
+ t_ServiceControl mysql55-mysqld start >/dev/null 2>&1
13
+ else
14
+ t_InstallPackage mysql-server
15
+ t_ServiceControl mysqld start >/dev/null 2>&1
16
+ fi
10
17
11
18
# Installing additional python/mysql module
12
19
t_InstallPackage MySQL-python
tests/r_lamp/0_lamp_install.sh CHANGED
@@ -4,7 +4,15 @@
4
4
5
5
t_Log "Running $0 - attempting to install LAMP stack."
6
6
7
- t_InstallPackage httpd mysql-server php
7
+ # MySQL
8
+ # starting with 5.10, we have to differ between mysql55 and mysql
9
+ if [ $centos_ver = 5 ]
10
+ then
11
+ t_InstallPackage mysql55-mysql-server httpd php
12
+ else
13
+ t_InstallPackage mysql-server httpd php
14
+ fi
15
+
8
16
t_ServiceControl httpd stop
9
17
ps ax | grep -v grep | grep -q httpd
10
18
if [ $? = 0 ]
file modified
+10 -2
tests/r_lamp/40_basic_lamp.sh CHANGED
@@ -2,8 +2,16 @@
2
2
3
3
t_Log "Running $0 - install a minimal lamp stack, and test it"
4
4
5
- t_InstallPackage httpd mysql mysql-server php php-mysql wget
6
- t_ServiceControl mysqld restart
5
+ # MySQL
6
+ # starting with 5.10, we have to differ between mysql55 and mysql
7
+ if [ $centos_ver = 5 ]
8
+ then
9
+ t_InstallPackage mysql55-mysql-server httpd mysql55-mysql php php-mysql wget
10
+ t_ServiceControl mysql55-mysqld restart
11
+ else
12
+ t_InstallPackage httpd mysql mysql-server php php-mysql wget
13
+ t_ServiceControl mysqld restart
14
+ fi
7
15
t_ServiceControl httpd restart
8
16
9
17
# Initializing a small MySQL db