Skip to content
Snippets Groups Projects
Commit 067d5c6c authored by Fran Garcia-Linares's avatar Fran Garcia-Linares
Browse files

Revert "Issue #3475974 by mondrake, fjgarlin: BROWSERTEST_OUTPUT_VERBOSE is... 

Revert "Issue #3475974 by mondrake, fjgarlin: BROWSERTEST_OUTPUT_VERBOSE is not passed to run-tests.sh when running tests with it"

This reverts commit 0a5516ba.
parent 0a5516ba
No related branches found
No related tags found
No related merge requests found
Pipeline #290376 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
assets/internal/.project-words.txt
+ 0
− 1
View file @ 067d5c6c
...@@ -99,4 +99,3 @@ nextmajor ...@@ -99,4 +99,3 @@ nextmajor
Dwebdriver Dwebdriver
logfile logfile
XVFB XVFB
usermod
includes/include.drupalci.main.yml
+ 4
− 5
View file @ 067d5c6c
...@@ -117,7 +117,6 @@ ...@@ -117,7 +117,6 @@
- chmod -R 755 $CI_PROJECT_DIR/$_WEB_ROOT/sites/default/files/simpletest - chmod -R 755 $CI_PROJECT_DIR/$_WEB_ROOT/sites/default/files/simpletest
- ln -s $CI_PROJECT_DIR/$_WEB_ROOT /var/www/html - ln -s $CI_PROJECT_DIR/$_WEB_ROOT /var/www/html
- chown -R www-data:www-data $CI_PROJECT_DIR - chown -R www-data:www-data $CI_PROJECT_DIR
- usermod -a -G root www-data
- service apache2 start - service apache2 start
# If the module already supports Drupal 11, do nothing, otherwise, claim Drupal 11 support for testing purposes. # If the module already supports Drupal 11, do nothing, otherwise, claim Drupal 11 support for testing purposes.
...@@ -1003,17 +1002,17 @@ nightwatch (next major): ...@@ -1003,17 +1002,17 @@ nightwatch (next major):
if [ "$PHPUNIT_VERSION" == "9" ]; then if [ "$PHPUNIT_VERSION" == "9" ]; then
PHPUNIT_OPTIONS="--printer=\Drupal\Tests\Listeners\HtmlOutputPrinter" PHPUNIT_OPTIONS="--printer=\Drupal\Tests\Listeners\HtmlOutputPrinter"
fi fi
echo "executing: vendor/bin/phpunit $PHPUNIT_OPTIONS --bootstrap $PWD/$_WEB_ROOT/core/tests/bootstrap.php $PWD/$_WEB_ROOT/modules/custom/$CI_PROJECT_NAME --log-junit $CI_PROJECT_DIR/junit.xml $WHAT_TO_RUN $_PHPUNIT_EXTRA" echo "executing: sudo -u www-data -E vendor/bin/phpunit $PHPUNIT_OPTIONS --bootstrap $PWD/$_WEB_ROOT/core/tests/bootstrap.php $PWD/$_WEB_ROOT/modules/custom/$CI_PROJECT_NAME --log-junit $CI_PROJECT_DIR/junit.xml $WHAT_TO_RUN $_PHPUNIT_EXTRA"
vendor/bin/phpunit $PHPUNIT_OPTIONS --bootstrap $PWD/$_WEB_ROOT/core/tests/bootstrap.php $PWD/$_WEB_ROOT/modules/custom/$CI_PROJECT_NAME --log-junit $CI_PROJECT_DIR/junit.xml $WHAT_TO_RUN $_PHPUNIT_EXTRA || EXIT_CODE=$? sudo -u www-data -E vendor/bin/phpunit $PHPUNIT_OPTIONS --bootstrap $PWD/$_WEB_ROOT/core/tests/bootstrap.php $PWD/$_WEB_ROOT/modules/custom/$CI_PROJECT_NAME --log-junit $CI_PROJECT_DIR/junit.xml $WHAT_TO_RUN $_PHPUNIT_EXTRA || EXIT_CODE=$?
elif [ "$_PHPUNIT_CONCURRENT" == "1" ]; then elif [ "$_PHPUNIT_CONCURRENT" == "1" ]; then
# if _PHPUNIT_TESTGROUPS is blank then do not add anything, because the test group will be handled by the matrix. # if _PHPUNIT_TESTGROUPS is blank then do not add anything, because the test group will be handled by the matrix.
# if _PHPUNIT_TESTGROUPS is --all then add --directory modules/custom/$CI_PROJECT_NAME # if _PHPUNIT_TESTGROUPS is --all then add --directory modules/custom/$CI_PROJECT_NAME
# Otherwise add $_PHPUNIT_TESTGROUPS (without the --group) # Otherwise add $_PHPUNIT_TESTGROUPS (without the --group)
WHAT_TO_RUN=$([[ "$_PHPUNIT_TESTGROUPS" == "" ]] && echo "" || ([[ "$_PHPUNIT_TESTGROUPS" == "--all" ]] && echo "--directory modules/custom/$CI_PROJECT_NAME" || echo "$_PHPUNIT_TESTGROUPS")) WHAT_TO_RUN=$([[ "$_PHPUNIT_TESTGROUPS" == "" ]] && echo "" || ([[ "$_PHPUNIT_TESTGROUPS" == "--all" ]] && echo "--directory modules/custom/$CI_PROJECT_NAME" || echo "$_PHPUNIT_TESTGROUPS"))
echo "_PHPUNIT_CONCURRENT=$_PHPUNIT_CONCURRENT, _PHPUNIT_TESTGROUPS=$_PHPUNIT_TESTGROUPS, _PHPUNIT_EXTRA=$_PHPUNIT_EXTRA, WHAT_TO_RUN=$WHAT_TO_RUN" echo "_PHPUNIT_CONCURRENT=$_PHPUNIT_CONCURRENT, _PHPUNIT_TESTGROUPS=$_PHPUNIT_TESTGROUPS, _PHPUNIT_EXTRA=$_PHPUNIT_EXTRA, WHAT_TO_RUN=$WHAT_TO_RUN"
echo "executing: php $_WEB_ROOT/core/scripts/run-tests.sh --color --keep-results --concurrency $_CONCURRENCY_THREADS --repeat '1' --sqlite 'sites/default/files/.sqlite' --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --xml $CI_PROJECT_DIR/$_WEB_ROOT/sites/default/files/simpletest --verbose --non-html $WHAT_TO_RUN $_PHPUNIT_EXTRA" echo "executing: sudo SYMFONY_DEPRECATIONS_HELPER='$SYMFONY_DEPRECATIONS_HELPER' MINK_DRIVER_ARGS_WEBDRIVER='$MINK_DRIVER_ARGS_WEBDRIVER' -u www-data php $_WEB_ROOT/core/scripts/run-tests.sh --color --keep-results --concurrency $_CONCURRENCY_THREADS --repeat '1' --sqlite 'sites/default/files/.sqlite' --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html $WHAT_TO_RUN $_PHPUNIT_EXTRA"
vendor/bin/phpunit --version vendor/bin/phpunit --version
php $_WEB_ROOT/core/scripts/run-tests.sh --color --keep-results --concurrency $_CONCURRENCY_THREADS --repeat "1" --sqlite "sites/default/files/.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --xml $CI_PROJECT_DIR/$_WEB_ROOT/sites/default/files/simpletest --verbose --non-html $WHAT_TO_RUN $_PHPUNIT_EXTRA || EXIT_CODE=$? sudo SYMFONY_DEPRECATIONS_HELPER="$SYMFONY_DEPRECATIONS_HELPER" MINK_DRIVER_ARGS_WEBDRIVER="$MINK_DRIVER_ARGS_WEBDRIVER" -u www-data php $_WEB_ROOT/core/scripts/run-tests.sh --color --keep-results --concurrency $_CONCURRENCY_THREADS --repeat "1" --sqlite "sites/default/files/.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --xml $CI_PROJECT_DIR/$_WEB_ROOT/sites/default/files/simpletest --verbose --non-html $WHAT_TO_RUN $_PHPUNIT_EXTRA || EXIT_CODE=$?
fi fi
- cp /var/log/apache2/test.apache.access.log $CI_PROJECT_DIR/apache.access.log.txt - cp /var/log/apache2/test.apache.access.log $CI_PROJECT_DIR/apache.access.log.txt
- cp /var/log/apache2/test.apache.error.log $CI_PROJECT_DIR/apache.error.log.txt - cp /var/log/apache2/test.apache.error.log $CI_PROJECT_DIR/apache.error.log.txt
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment