php test replaced with simplier smoke
This commit is contained in:
Branislav Náter
parent
04cd384648
commit
355f667417
@ -1,3 +0,0 @@
|
|||||||
PURPOSE of /CoreOS/httpd/Sanity/httpd-php-mysql-sanity-test
|
|
||||||
Description: test fetching data from mysqldb/mariadb through php
|
|
||||||
Author: Karel Srot <ksrot@redhat.com>
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
<?php
|
|
||||||
$db = mysqli_connect("localhost", "root");
|
|
||||||
if (!$db) {
|
|
||||||
die("Could not connect");
|
|
||||||
}
|
|
||||||
if (!mysqli_select_db($db, "php_mysql_test")) {
|
|
||||||
die("Could not select database");
|
|
||||||
}
|
|
||||||
$res = mysqli_query($db, "SELECT * from foobar");
|
|
||||||
$row = mysqli_fetch_assoc($res);
|
|
||||||
printf("%s is %d\n", $row['name'], $row['value']);
|
|
||||||
?>
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
<?php
|
|
||||||
$db = mysql_connect("localhost", "root");
|
|
||||||
if (!$db) {
|
|
||||||
die("Could not connect");
|
|
||||||
}
|
|
||||||
if (!mysql_select_db("php_mysql_test")) {
|
|
||||||
die("Could not select database");
|
|
||||||
}
|
|
||||||
$res = mysql_query("SELECT * from foobar");
|
|
||||||
$row = mysql_fetch_assoc($res);
|
|
||||||
printf("%s is %d\n", $row['name'], $row['value']);
|
|
||||||
?>
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
|
|
||||||
Alias /php_mysql_test /var/www/php_mysql_test
|
|
||||||
|
|
||||||
<Directory /var/www/php_mysql_test>
|
|
||||||
</Directory>
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
|
|
||||||
CREATE DATABASE php_mysql_test;
|
|
||||||
USE php_mysql_test;
|
|
||||||
|
|
||||||
CREATE TABLE foobar (name VARCHAR(10), value INTEGER);
|
|
||||||
INSERT INTO foobar VALUES("fish", 42);
|
|
||||||
@ -1,102 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
#
|
|
||||||
# runtest.sh of /CoreOS/httpd/Sanity/httpd-php-mysql-sanity-test
|
|
||||||
# Description: test fetching data from mysqldb/mariadb through php
|
|
||||||
# Author: Karel Srot <ksrot@redhat.com>
|
|
||||||
#
|
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
#
|
|
||||||
# Copyright (c) 2013 Red Hat, Inc. All rights reserved.
|
|
||||||
#
|
|
||||||
# This copyrighted material is made available to anyone wishing
|
|
||||||
# to use, modify, copy, or redistribute it subject to the terms
|
|
||||||
# and conditions of the GNU General Public License version 2.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be
|
|
||||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
|
||||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
||||||
# PURPOSE. See the GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public
|
|
||||||
# License along with this program; if not, write to the Free
|
|
||||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
||||||
# Boston, MA 02110-1301, USA.
|
|
||||||
#
|
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
# Include Beaker environment
|
|
||||||
[ -e /usr/bin/rhts-environment.sh ] && . /usr/bin/rhts-environment.sh
|
|
||||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
|
||||||
|
|
||||||
PACKAGES="${PACKAGES:-httpd}"
|
|
||||||
REQUIRES="${REQUIRES:-php $DB}"
|
|
||||||
|
|
||||||
rlJournalStart
|
|
||||||
rlPhaseStartSetup
|
|
||||||
rlRun "rlImport httpd/http" 0 "Import httpd library"
|
|
||||||
if rlIsRHEL 5 6 && [ $httpCOLLECTION = 0 ]; then
|
|
||||||
DB="mysql-server"
|
|
||||||
rlRun "rlImport mysql/basic" 0 "Import mysqld library"
|
|
||||||
SERVICE=${mysqlServiceName}
|
|
||||||
else
|
|
||||||
DB="mariadb-server"
|
|
||||||
rlRun "rlImport mariadb55/basic" 0 "Import mariadb library"
|
|
||||||
SERVICE=${mariadbServiceName}
|
|
||||||
fi
|
|
||||||
# install also php-mysql on rhel-6 (instead of php-mysqlnd on rhel-7)
|
|
||||||
rlRun "rlImport php/utils"
|
|
||||||
phpPdoPhpMysqlSetup
|
|
||||||
rlAssertRpm --all
|
|
||||||
rlRun "rlServiceStart $SERVICE" 0
|
|
||||||
rlRun "echo DROP DATABASE php_mysql_test | mysql -u root" 0,1
|
|
||||||
rlRun "mysql --verbose -u root < php_mysql_test.sql"
|
|
||||||
rlRun "httpStop" 0 "Stop httpd if running"
|
|
||||||
rlRun "> $httpLOGDIR/error_log"
|
|
||||||
rlRun "rm -rvf $httpROOTDIR/php_mysql_test"
|
|
||||||
rlRun "mkdir -v $httpROOTDIR/php_mysql_test"
|
|
||||||
rlRun "cp -v php_mysql_test.conf $httpCONFDIR/conf.d/"
|
|
||||||
php_version=`rlCheckRpm php`
|
|
||||||
if [[ $php_version =~ php-7* ]] || [[ $php_version =~ php-5.[5-6]* ]]; then
|
|
||||||
rlRun "cp -v new_mysql.php $httpROOTDIR/php_mysql_test/mysql.php"
|
|
||||||
else
|
|
||||||
rlRun "cp -v old_mysql.php $httpROOTDIR/php_mysql_test/mysql.php"
|
|
||||||
fi
|
|
||||||
rlRun "sed -i 's|/var/www|$httpROOTDIR|' $httpCONFDIR/conf.d/php_mysql_test.conf"
|
|
||||||
rlRun "chown -R apache: $httpROOTDIR/php_mysql_test"
|
|
||||||
#rlRun "restorecon $httpROOTDIR/php_mysql_test"
|
|
||||||
selinuxenabled && rlRun "chcon -Rv -t httpd_sys_content_t $httpROOTDIR/php_mysql_test"
|
|
||||||
rlRun "httpStart" 0 "Start httpd"
|
|
||||||
rlPhaseEnd
|
|
||||||
|
|
||||||
rlPhaseStartTest
|
|
||||||
URL="http://localhost/php_mysql_test/"
|
|
||||||
RETVAL=0
|
|
||||||
tries=`seq 1 10`
|
|
||||||
|
|
||||||
for n in ${tries}; do
|
|
||||||
output=`curl -s $URL/mysql.php`
|
|
||||||
rv=$?
|
|
||||||
echo "PHP output ${n}: ${rv} x${output}y"
|
|
||||||
[ ${rv} -ne 0 -o "x${output}y" != "xfish is 42y" ] && RETVAL=66
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ $RETVAL -ne 0 ]; then
|
|
||||||
rlFail
|
|
||||||
else
|
|
||||||
rlPass
|
|
||||||
fi
|
|
||||||
rlPhaseEnd
|
|
||||||
|
|
||||||
rlPhaseStartCleanup
|
|
||||||
rlRun "rm -f $httpCONFDIR/conf.d/php_mysql_test.conf"
|
|
||||||
rlRun "rm -rf $httpROOTDIR/php_mysql_test"
|
|
||||||
rlRun "echo DROP DATABASE php_mysql_test | mysql -u root"
|
|
||||||
rlRun "rlServiceRestore ${SERVICE}" 0
|
|
||||||
rlRun "httpStop" 0 "Stop httpd if running"
|
|
||||||
# uninstall php-mysql on rhel-6 if it was installed during setup
|
|
||||||
phpPdoPhpMysqlCleanup
|
|
||||||
rlPhaseEnd
|
|
||||||
rlJournalPrintText
|
|
||||||
rlJournalEnd
|
|
||||||
@ -1,12 +1,12 @@
|
|||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
#
|
#
|
||||||
# Makefile of /CoreOS/httpd/Sanity/httpd-php-mysql-sanity-test
|
# Makefile of /CoreOS/httpd/Sanity/smoke
|
||||||
# Description: test fetching data from mysqldb/mariadb through php
|
# Description: Simple check of httpd test page
|
||||||
# Author: Karel Srot <ksrot@redhat.com>
|
# Author: Branislav Nater <bnater@redhat.com>
|
||||||
#
|
#
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
#
|
#
|
||||||
# Copyright (c) 2013 Red Hat, Inc. All rights reserved.
|
# Copyright (c) 2021 Red Hat, Inc.
|
||||||
#
|
#
|
||||||
# This copyrighted material is made available to anyone wishing
|
# This copyrighted material is made available to anyone wishing
|
||||||
# to use, modify, copy, or redistribute it subject to the terms
|
# to use, modify, copy, or redistribute it subject to the terms
|
||||||
@ -24,12 +24,12 @@
|
|||||||
#
|
#
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
export TEST=/CoreOS/httpd/Sanity/httpd-php-mysql-sanity-test
|
export TEST=/CoreOS/httpd/Sanity/smoke
|
||||||
export TESTVERSION=1.0
|
export TESTVERSION=1.0
|
||||||
|
|
||||||
BUILT_FILES=
|
BUILT_FILES=
|
||||||
|
|
||||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE new_mysql.php old_mysql.php php_mysql_test.sql php_mysql_test.conf
|
FILES=$(METADATA) runtest.sh Makefile PURPOSE
|
||||||
|
|
||||||
.PHONY: all install download clean
|
.PHONY: all install download clean
|
||||||
|
|
||||||
@ -43,25 +43,23 @@ clean:
|
|||||||
rm -f *~ $(BUILT_FILES)
|
rm -f *~ $(BUILT_FILES)
|
||||||
|
|
||||||
|
|
||||||
-include /usr/share/rhts/lib/rhts-make.include
|
include /usr/share/rhts/lib/rhts-make.include
|
||||||
|
|
||||||
$(METADATA): Makefile
|
$(METADATA): Makefile
|
||||||
@echo "Owner: Karel Srot <ksrot@redhat.com>" > $(METADATA)
|
@echo "Owner: Branislav Nater <bnater@redhat.com>" > $(METADATA)
|
||||||
@echo "Name: $(TEST)" >> $(METADATA)
|
@echo "Name: $(TEST)" >> $(METADATA)
|
||||||
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||||
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||||
@echo "Description: test fetching data from mysqldb/mariadb through php" >> $(METADATA)
|
@echo "Description: Simple check of httpd test page" >> $(METADATA)
|
||||||
@echo "Type: Sanity" >> $(METADATA)
|
@echo "Type: Sanity" >> $(METADATA)
|
||||||
@echo "TestTime: 5m" >> $(METADATA)
|
@echo "TestTime: 5m" >> $(METADATA)
|
||||||
@echo "RunFor: httpd" >> $(METADATA)
|
@echo "RunFor: httpd" >> $(METADATA)
|
||||||
@echo "Requires: httpd php php-zts php-mysqlnd mysql-server mariadb-server" >> $(METADATA)
|
@echo "Requires: httpd mod_ssl" >> $(METADATA)
|
||||||
@echo "RhtsRequires: library(httpd/http)" >> $(METADATA)
|
@echo "RhtsRequires: library(httpd/http)" >> $(METADATA)
|
||||||
@echo "RhtsRequires: library(mysql/basic)" >> $(METADATA)
|
|
||||||
@echo "RhtsRequires: library(mariadb55/basic)" >> $(METADATA)
|
|
||||||
@echo "RhtsRequires: library(php/utils)" >> $(METADATA)
|
|
||||||
@echo "Priority: Normal" >> $(METADATA)
|
@echo "Priority: Normal" >> $(METADATA)
|
||||||
@echo "License: GPLv2" >> $(METADATA)
|
@echo "License: GPLv2" >> $(METADATA)
|
||||||
@echo "Confidential: no" >> $(METADATA)
|
@echo "Confidential: no" >> $(METADATA)
|
||||||
@echo "Destructive: no" >> $(METADATA)
|
@echo "Destructive: no" >> $(METADATA)
|
||||||
|
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
|
||||||
|
|
||||||
rhts-lint $(METADATA)
|
rhts-lint $(METADATA)
|
||||||
3
tests/smoke/PURPOSE
Normal file
3
tests/smoke/PURPOSE
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
PURPOSE of /CoreOS/httpd/Sanity/smoke
|
||||||
|
Description: Simple check of httpd
|
||||||
|
Author: Branislav Nater <bnater@redhat.com>
|
||||||
64
tests/smoke/runtest.sh
Executable file
64
tests/smoke/runtest.sh
Executable file
@ -0,0 +1,64 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# runtest.sh of /CoreOS/httpd/Sanity/smoke
|
||||||
|
# Description: Simple check of httpd test page
|
||||||
|
# Author: Branislav Nater <bnater@redhat.com>
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Copyright (c) 2021 Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This copyrighted material is made available to anyone wishing
|
||||||
|
# to use, modify, copy, or redistribute it subject to the terms
|
||||||
|
# and conditions of the GNU General Public License version 2.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be
|
||||||
|
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE. See the GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public
|
||||||
|
# License along with this program; if not, write to the Free
|
||||||
|
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||||
|
# Boston, MA 02110-1301, USA.
|
||||||
|
#
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
# Include rhts environment
|
||||||
|
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||||
|
|
||||||
|
PACKAGES="${PACKAGES:-httpd}"
|
||||||
|
REQUIRES=${REQUIRES:-}
|
||||||
|
|
||||||
|
rlJournalStart
|
||||||
|
rlPhaseStartSetup
|
||||||
|
rlRun "rlImport --all" 0 "Importing Beaker libraries" || rlDie
|
||||||
|
rlAssertRpm --all
|
||||||
|
rlFileBackup --clean ${httpCONFDIR}/conf/
|
||||||
|
rlFileBackup --clean ${httpCONFDIR}/conf.d/
|
||||||
|
rlFileBackup --clean ${httpCONFDIR}/conf.modules.d/
|
||||||
|
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
|
||||||
|
rlRun "pushd $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest
|
||||||
|
rlRun "httpStart" 0 "Start httpd"
|
||||||
|
rlRun "httpStatus" 0 "Check status"
|
||||||
|
rlRun "httpStop" 0 "Stop httpd"
|
||||||
|
|
||||||
|
rlRun "httpSecureStart" 0 "Start httpd with ssl"
|
||||||
|
rlRun "httpInstallCa $(hostname)" 0 "Install CA"
|
||||||
|
rlRun "httpSecureStatus" 0 "Check status"
|
||||||
|
rlRun "httpRemoveCa" 0 "Remove CA"
|
||||||
|
rlRun "httpSecureStop" 0 "Stop httpd with ssl"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun "rlFileRestore" 0 "Restoring original configuration"
|
||||||
|
rlRun "popd"
|
||||||
|
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
|
||||||
|
rlPhaseEnd
|
||||||
|
rlJournalEnd
|
||||||
|
rlJournalPrintText
|
||||||
@ -6,7 +6,7 @@
|
|||||||
tags:
|
tags:
|
||||||
- classic
|
- classic
|
||||||
tests:
|
tests:
|
||||||
- httpd-php-mysql-sanity-test
|
- smoke
|
||||||
required_packages:
|
required_packages:
|
||||||
- findutils # beakerlib needs find command
|
- findutils # beakerlib needs find command
|
||||||
- which # smoke requires which command
|
- which # smoke requires which command
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user