From 0aa7ad0849e692a7805b10ae773e07c4709a6c9a Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Nov 23 2011 19:02:09 +0000
Subject: Changed names of php tests


---

diff --git a/tests/p_php/10-php-mylsq-test.sh b/tests/p_php/10-php-mylsq-test.sh
deleted file mode 100755
index cd2a92b..0000000
--- a/tests/p_php/10-php-mylsq-test.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-# Author: Athmane Madjoudj <athmanem@gmail.com>
-# Author: Christoph Galuschka <christoph.galuschka@chello.at>
-# reusing the script from LAMP-Tests
-
-t_Log "Running $0 - php-cli basic interaction with mysql test."
-
-# Install php-mysql-module
-t_InstallPackage php-mysql
-
-# we need a working and running mysql server
-t_InstallPackage mysql-server
-t_ServiceControl mysqld start >/dev/null 2>&1
-
-#create a little DB to use
-CREATE='/var/tmp/mysql-php-QA.sql'
-
-cat >$CREATE <<EOF
-drop database phptests;
-create database phptests;
-use phptests;
-create table tests (name varchar(20)) ;
-grant all on phptests.* to 'centos'@'localhost' identified by 'qa';
-flush privileges;
-EOF
-
-mysql <$CREATE
-/bin/rm $CREATE
-
-# create PHP Script and write something into DB
-INSERT='/var/tmp/test.php'
-
-cat >$INSERT <<EOF
-<?php
-\$dbconnect = mysql_connect("localhost","centos","qa");
-if (!\$dbconnect)
-  {
-  die('Could not connect: ' . mysql_error());
-  }
-mysql_select_db("phptests", \$dbconnect);
-mysql_query("INSERT INTO tests (name)
-VALUES ('phpsqltest')");
-mysql_close(\$dbconnect);
-?> 
-EOF
-
-php $INSERT
-if [ $? -ne 0 ]
-  then
-  t_Log FAIL
-  exit 1
-fi
-
-# create PHP script to read from DB
-READ='/var/tmp/read.php'
-cat >$READ <<EOF
-<?php
-\$dbconnect = mysql_connect("localhost","centos","qa");
-if (!\$dbconnect)
-  {
-  die('Could not connect: ' . mysql_error());
-  }
-mysql_select_db("phptests", \$dbconnect);
-\$array = mysql_query("SELECT count(*) as success FROM tests WHERE name = 'phpsqltest'");
-mysql_close(\$dbconnect);
-\$line = mysql_fetch_array(\$array, MYSQL_ASSOC);
-print \$line['success'];
-?>
-EOF
-
-# If we execute the script and get '1' it works (1 entry should be in the DB)
-php $READ | grep -q '1'
-
-t_CheckExitStatus $?
-
diff --git a/tests/p_php/10-php-test.sh b/tests/p_php/10-php-test.sh
new file mode 100755
index 0000000..af909e4
--- /dev/null
+++ b/tests/p_php/10-php-test.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Author: Athmane Madjoudj <athmanem@gmail.com>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
+
+t_Log "Running $0 - php phpinfo() function test."
+
+# Comparing hostname with output of phpinfo()
+FILE='/var/tmp/php-test.php'
+
+cat > $FILE <<EOF
+<?php
+phpinfo();
+?>
+EOF
+
+# setting timezone for phpinfo
+sed  -i 's/\;date\.timezone\ \=/date\.timezone = \"Europe\/Berlin\"/' /etc/php.ini
+
+php $FILE | grep -q 'Zend Engine'
+
+t_CheckExitStatus $?
+
+#reversing changes
+/bin/rm $FILE
+sed  -i 's/\date\.timezone\ \=\ \"Europe\/Berlin\"/\;date\.timezone\ \=/' /etc/php.ini
diff --git a/tests/p_php/20-php-mysql-test.sh b/tests/p_php/20-php-mysql-test.sh
new file mode 100755
index 0000000..cd2a92b
--- /dev/null
+++ b/tests/p_php/20-php-mysql-test.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+# Author: Athmane Madjoudj <athmanem@gmail.com>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
+# reusing the script from LAMP-Tests
+
+t_Log "Running $0 - php-cli basic interaction with mysql test."
+
+# Install php-mysql-module
+t_InstallPackage php-mysql
+
+# we need a working and running mysql server
+t_InstallPackage mysql-server
+t_ServiceControl mysqld start >/dev/null 2>&1
+
+#create a little DB to use
+CREATE='/var/tmp/mysql-php-QA.sql'
+
+cat >$CREATE <<EOF
+drop database phptests;
+create database phptests;
+use phptests;
+create table tests (name varchar(20)) ;
+grant all on phptests.* to 'centos'@'localhost' identified by 'qa';
+flush privileges;
+EOF
+
+mysql <$CREATE
+/bin/rm $CREATE
+
+# create PHP Script and write something into DB
+INSERT='/var/tmp/test.php'
+
+cat >$INSERT <<EOF
+<?php
+\$dbconnect = mysql_connect("localhost","centos","qa");
+if (!\$dbconnect)
+  {
+  die('Could not connect: ' . mysql_error());
+  }
+mysql_select_db("phptests", \$dbconnect);
+mysql_query("INSERT INTO tests (name)
+VALUES ('phpsqltest')");
+mysql_close(\$dbconnect);
+?> 
+EOF
+
+php $INSERT
+if [ $? -ne 0 ]
+  then
+  t_Log FAIL
+  exit 1
+fi
+
+# create PHP script to read from DB
+READ='/var/tmp/read.php'
+cat >$READ <<EOF
+<?php
+\$dbconnect = mysql_connect("localhost","centos","qa");
+if (!\$dbconnect)
+  {
+  die('Could not connect: ' . mysql_error());
+  }
+mysql_select_db("phptests", \$dbconnect);
+\$array = mysql_query("SELECT count(*) as success FROM tests WHERE name = 'phpsqltest'");
+mysql_close(\$dbconnect);
+\$line = mysql_fetch_array(\$array, MYSQL_ASSOC);
+print \$line['success'];
+?>
+EOF
+
+# If we execute the script and get '1' it works (1 entry should be in the DB)
+php $READ | grep -q '1'
+
+t_CheckExitStatus $?
+
diff --git a/tests/p_php/php-test.sh b/tests/p_php/php-test.sh
deleted file mode 100755
index af909e4..0000000
--- a/tests/p_php/php-test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Author: Athmane Madjoudj <athmanem@gmail.com>
-# Author: Christoph Galuschka <christoph.galuschka@chello.at>
-
-t_Log "Running $0 - php phpinfo() function test."
-
-# Comparing hostname with output of phpinfo()
-FILE='/var/tmp/php-test.php'
-
-cat > $FILE <<EOF
-<?php
-phpinfo();
-?>
-EOF
-
-# setting timezone for phpinfo
-sed  -i 's/\;date\.timezone\ \=/date\.timezone = \"Europe\/Berlin\"/' /etc/php.ini
-
-php $FILE | grep -q 'Zend Engine'
-
-t_CheckExitStatus $?
-
-#reversing changes
-/bin/rm $FILE
-sed  -i 's/\date\.timezone\ \=\ \"Europe\/Berlin\"/\;date\.timezone\ \=/' /etc/php.ini