rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix test to use beakerlib role

Browse Source 
1. standard-test-roles dropped support to rhts role, so we need to replace with beakerlib role that now support beakerlib-libraries
2. httpd requires services and this does not work on container, so it got removed from tests.yml
This commit is contained in:
Bruno Goncalves 2018-06-13 11:48:11 +02:00
parent df56b6f20c
commit 0c0d4558f1
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/httpd-php-mysql-sanity-test/Makefile
View File

@ -29,7 +29,7 @@ export TESTVERSION=1.0
BUILT_FILES= BUILT_FILES=
FILES=$(METADATA) runtest.sh Makefile PURPOSE mysql.php php_mysql_test.sql php_mysql_test.conf FILES=$(METADATA) runtest.sh Makefile PURPOSE new_mysql.php old_mysql.php php_mysql_test.sql php_mysql_test.conf
.PHONY: all install download clean .PHONY: all install download clean

2
tests/httpd-php-mysql-sanity-test/runtest.sh
View File

@ -57,7 +57,7 @@ rlJournalStart
rlRun "rm -rvf $httpROOTDIR/php_mysql_test" rlRun "rm -rvf $httpROOTDIR/php_mysql_test"
rlRun "mkdir -v $httpROOTDIR/php_mysql_test" rlRun "mkdir -v $httpROOTDIR/php_mysql_test"
rlRun "cp -v php_mysql_test.conf $httpCONFDIR/conf.d/" rlRun "cp -v php_mysql_test.conf $httpCONFDIR/conf.d/"
rlRun "php_version=`rlCheckRpm php`" php_version=`rlCheckRpm php`
if [[ $php_version =~ php-7* ]] || [[ $php_version =~ php-5.[5-6]* ]]; then if [[ $php_version =~ php-7* ]] || [[ $php_version =~ php-5.[5-6]* ]]; then
rlRun "cp -v new_mysql.php $httpROOTDIR/php_mysql_test/mysql.php" rlRun "cp -v new_mysql.php $httpROOTDIR/php_mysql_test/mysql.php"
else else

5
tests/tests.yml
View File

@ -1,13 +1,10 @@
--- ---
# Tests that run in all contexts # Tests that run in all contexts
- hosts: localhost - hosts: localhost
vars:
use_beakerlib_libraries: true
roles: roles:
- role: standard-test-rhts - role: standard-test-beakerlib
tags: tags:
- classic - classic
- container
tests: tests:
- httpd-php-mysql-sanity-test - httpd-php-mysql-sanity-test
required_packages: required_packages: