From 8260a0843ba9346b0efb7fd96e42178780e7f863 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 27 Aug 2022 09:43:20 +0200 Subject: [PATCH] Undone changes for sh on API tests --- .github/workflows/ci-tests.yml | 1 + .github/workflows/ci.yml | 1 + bin/test/run-api-tests.sh | 38 +++++++++++++--------------------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index b7f7af98..3f3915c3 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -28,6 +28,7 @@ jobs: php-extensions: openswoole-4.11.1 extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }} - run: composer test:${{ inputs.test-group }}:ci + shell: bash - uses: actions/upload-artifact@v3 if: ${{ matrix.php-version == '8.1' }} with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 709c9834..857dbf59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,6 +49,7 @@ jobs: - run: composer install --no-interaction --prefer-dist - run: ./vendor/bin/rr get --location bin/ && chmod +x bin/rr - run: composer test:api:rr + shell: bash cli-tests: uses: './.github/workflows/ci-tests.yml' diff --git a/bin/test/run-api-tests.sh b/bin/test/run-api-tests.sh index 24652cb7..c115feac 100755 --- a/bin/test/run-api-tests.sh +++ b/bin/test/run-api-tests.sh @@ -1,8 +1,7 @@ -#!/usr/bin/env sh export APP_ENV=test -export DB_DRIVER=postgres export TEST_ENV=api export TEST_RUNTIME=${TEST_RUNTIME:-"openswoole"} +export DB_DRIVER=${DB_DRIVER:-"postgres"} export GENERATE_COVERAGE=${GENERATE_COVERAGE:-"no"} # Reset logs @@ -12,35 +11,26 @@ mkdir data/log/api-tests touch $OUTPUT_LOGS # Try to stop server just in case it hanged in last execution -if test "$TEST_RUNTIME" == 'openswoole'; then - vendor/bin/laminas mezzio:swoole:stop -elif test "$TEST_RUNTIME" == 'rr'; then - bin/rr stop -f -fi +[[ $TEST_RUNTIME == 'openswoole' ]] && vendor/bin/laminas mezzio:swoole:stop +[[ $TEST_RUNTIME == 'rr' ]] && bin/rr stop -f echo 'Starting server...' -if test "$TEST_RUNTIME" == 'openswoole'; then - vendor/bin/laminas mezzio:swoole:start -d -elif test "$TEST_RUNTIME" == 'rr'; then - bin/rr serve -p -c=config/roadrunner/.rr.dev.yml \ - -o=http.address=0.0.0.0:9999 \ - -o=logs.encoding=json \ - -o=logs.channels.http.encoding=json \ - -o=logs.channels.server.encoding=json \ - -o=logs.output="${PWD}/${OUTPUT_LOGS}" \ - -o=logs.channels.http.output="${PWD}/${OUTPUT_LOGS}" \ - -o=logs.channels.server.output="${PWD}/${OUTPUT_LOGS}" & -fi +[[ $TEST_RUNTIME == 'openswoole' ]] && vendor/bin/laminas mezzio:swoole:start -d +[[ $TEST_RUNTIME == 'rr' ]] && bin/rr serve -p -c=config/roadrunner/.rr.dev.yml \ + -o=http.address=0.0.0.0:9999 \ + -o=logs.encoding=json \ + -o=logs.channels.http.encoding=json \ + -o=logs.channels.server.encoding=json \ + -o=logs.output="${PWD}/${OUTPUT_LOGS}" \ + -o=logs.channels.http.output="${PWD}/${OUTPUT_LOGS}" \ + -o=logs.channels.server.output="${PWD}/${OUTPUT_LOGS}" & sleep 2 # Let's give the server a couple of seconds to start vendor/bin/phpunit --order-by=random -c phpunit-api.xml --testdox --colors=always --log-junit=build/coverage-api/junit.xml $* testsExitCode=$? -if test "$TEST_RUNTIME" == 'openswoole'; then - vendor/bin/laminas mezzio:swoole:stop -elif test "$TEST_RUNTIME" == 'rr'; then - bin/rr stop -c config/roadrunner/.rr.dev.yml -o=http.address=0.0.0.0:9999 -fi +[[ $TEST_RUNTIME == 'openswoole' ]] && vendor/bin/laminas mezzio:swoole:stop +[[ $TEST_RUNTIME == 'rr' ]] && bin/rr stop -c config/roadrunner/.rr.dev.yml -o=http.address=0.0.0.0:9999 # Exit this script with the same code as the tests. If tests failed, this script has to fail exit $testsExitCode