mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2025-03-16 11:03:50 +01:00

Compare commits

...

2 commits

Author SHA1 Message Date
dependabot[bot]
d49083123c
[Dependabot] Update helmich/typo3-typoscript-lint requirement from 3.1.1 || 3.2.1 to ^3.3.0 ()
---
updated-dependencies:
- dependency-name: helmich/typo3-typoscript-lint
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-03 13:03:35 +00:00
Eike Starkmann
8bb14d867d
[FEATURE] Switch the PHPUnit tests to paratest ()
Fixes 
2025-02-03 13:52:48 +01:00
3 changed files with 9 additions and 10 deletions

View file

@ -3,5 +3,3 @@
[[ ! -e /.dockerenv ]] && exit 0 [[ ! -e /.dockerenv ]] && exit 0
set -xe set -xe
apk add parallel

View file

@ -555,7 +555,7 @@ case ${TEST_SUITE} in
;; ;;
functional) functional)
[ -z "${TEST_FILE}" ] && TEST_FILE="Tests/Functional" [ -z "${TEST_FILE}" ] && TEST_FILE="Tests/Functional"
COMMAND=".Build/bin/phpunit -c Build/phpunit/FunctionalTests.xml --exclude-group not-${DBMS} ${EXTRA_TEST_OPTIONS} ${TEST_FILE}" COMMAND=".Build/bin/paratest -c Build/phpunit/FunctionalTests.xml --exclude-group not-${DBMS} ${EXTRA_TEST_OPTIONS} ${TEST_FILE}"
case ${DBMS} in case ${DBMS} in
mariadb) mariadb)
echo "Using driver: ${DATABASE_DRIVER}" echo "Using driver: ${DATABASE_DRIVER}"
@ -642,12 +642,12 @@ case ${TEST_SUITE} in
;; ;;
unit) unit)
[ -z "${TEST_FILE}" ] && TEST_FILE="Tests/Unit" [ -z "${TEST_FILE}" ] && TEST_FILE="Tests/Unit"
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} .Build/bin/phpunit -c Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} .Build/bin/paratest -c Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE}
SUITE_EXIT_CODE=$? SUITE_EXIT_CODE=$?
;; ;;
unitRandom) unitRandom)
[ -z "${TEST_FILE}" ] && TEST_FILE="Tests/Unit" [ -z "${TEST_FILE}" ] && TEST_FILE="Tests/Unit"
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-random-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} .Build/bin/phpunit -c Build/phpunit/UnitTests.xml --order-by=random ${EXTRA_TEST_OPTIONS} ${PHPUNIT_RANDOM} ${TEST_FILE} ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-random-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} .Build/bin/paratest -c Build/phpunit/UnitTests.xml --order-by=random ${EXTRA_TEST_OPTIONS} ${PHPUNIT_RANDOM} ${TEST_FILE}
SUITE_EXIT_CODE=$? SUITE_EXIT_CODE=$?
;; ;;
update) update)

View file

@ -47,9 +47,10 @@
"typo3/cms-frontend": "^12.4.26" "typo3/cms-frontend": "^12.4.26"
}, },
"require-dev": { "require-dev": {
"brianium/paratest": "6.11.1",
"ergebnis/composer-normalize": "2.45.0", "ergebnis/composer-normalize": "2.45.0",
"friendsofphp/php-cs-fixer": "3.68.5", "friendsofphp/php-cs-fixer": "3.68.5",
"helmich/typo3-typoscript-lint": "3.1.1 || 3.2.1", "helmich/typo3-typoscript-lint": "^3.3.0",
"icanhazstring/composer-unused": "0.8.11", "icanhazstring/composer-unused": "0.8.11",
"php-parallel-lint/php-parallel-lint": "1.4.0", "php-parallel-lint/php-parallel-lint": "1.4.0",
"phpmd/phpmd": "2.15.0", "phpmd/phpmd": "2.15.0",
@ -126,7 +127,7 @@
"ci:coverage:functional": [ "ci:coverage:functional": [
"@ci:tests:create-directories", "@ci:tests:create-directories",
"@coverage:create-directories", "@coverage:create-directories",
"phpunit -c Build/phpunit/FunctionalTests.xml --whitelist Classes --coverage-php=build/coverage/functional.cov Tests/Functional" "paratest -c Build/phpunit/FunctionalTests.xml --whitelist Classes --coverage-php=build/coverage/functional.cov Tests/Functional"
], ],
"ci:coverage:merge": [ "ci:coverage:merge": [
"@coverage:create-directories", "@coverage:create-directories",
@ -134,7 +135,7 @@
], ],
"ci:coverage:unit": [ "ci:coverage:unit": [
"@coverage:create-directories", "@coverage:create-directories",
"phpunit -c Build/phpunit/UnitTests.xml --whitelist Classes --coverage-php=build/coverage/unit.cov Tests/Unit" "paratest -c Build/phpunit/UnitTests.xml --whitelist Classes --coverage-php=build/coverage/unit.cov Tests/Unit"
], ],
"ci:json:lint": "find . ! -path '*/.cache/*' ! -path '*/.Build/*' ! -path '*/node_modules/*' -name '*.json' | xargs -r php .Build/bin/jsonlint -q", "ci:json:lint": "find . ! -path '*/.cache/*' ! -path '*/.Build/*' ! -path '*/node_modules/*' -name '*.json' | xargs -r php .Build/bin/jsonlint -q",
"ci:php": [ "ci:php": [
@ -162,9 +163,9 @@
"ci:tests:create-directories": "mkdir -p .Build/public/typo3temp/var/tests", "ci:tests:create-directories": "mkdir -p .Build/public/typo3temp/var/tests",
"ci:tests:functional": [ "ci:tests:functional": [
"@ci:tests:create-directories", "@ci:tests:create-directories",
"find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \\\"Running functional test suite {}\\\"; .Build/bin/phpunit -c Build/phpunit/FunctionalTests.xml {}';" "paratest -c Build/phpunit/FunctionalTests.xml Tests/Functional"
], ],
"ci:tests:unit": "phpunit -c Build/phpunit/UnitTests.xml Tests/Unit", "ci:tests:unit": "paratest -c Build/phpunit/UnitTests.xml Tests/Unit",
"ci:typoscript:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript", "ci:typoscript:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript",
"ci:xliff:lint": "php Build/xliff/xliff-lint lint:xliff Resources/Private/Language", "ci:xliff:lint": "php Build/xliff/xliff-lint lint:xliff Resources/Private/Language",
"ci:yaml:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' \\( -name '*.yaml' -o -name '*.yml' \\) | xargs -r php ./.Build/bin/yaml-lint", "ci:yaml:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' \\( -name '*.yaml' -o -name '*.yml' \\) | xargs -r php ./.Build/bin/yaml-lint",