From 300aa866c252ce24ac89ca39e53b69692bb207ca Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Sat, 28 Aug 2021 17:05:55 +0200
Subject: [PATCH] [TASK] Raise typo3/testing-framework:^6.10.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This minor version raise brings significant
performance improvements for functional tests,
especially with mysql/mariadb & sqlite.
composer req --dev typo3/testing-framework:^6.10.0
Change-Id: I09f8a673f55710b8d237faa280121853dcabc378
Resolves: #95028
Releases: master, 10.4
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/70806
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../pre-merge/acceptance-application.yml | 4 ++--
Build/gitlab-ci/pre-merge/functional.yml | 4 ++--
Build/testing-docker/local/docker-compose.yml | 2 ++
composer.json | 2 +-
composer.lock | 16 +++++++++-------
5 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/Build/gitlab-ci/pre-merge/acceptance-application.yml b/Build/gitlab-ci/pre-merge/acceptance-application.yml
index 24ef42be8cf5..545313ee22db 100644
--- a/Build/gitlab-ci/pre-merge/acceptance-application.yml
+++ b/Build/gitlab-ci/pre-merge/acceptance-application.yml
@@ -9,7 +9,7 @@ acceptance application mariadb php 7.4 pre-merge:
paths:
- typo3temp/var/tests/acceptance/typo3temp/var/log
- typo3temp/var/tests/AcceptanceReports
- parallel: 10
+ parallel: 13
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.4
- Build/Scripts/runTests.sh -s acceptance -p 7.4 -d mariadb -i 10.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
@@ -25,7 +25,7 @@ acceptance application mariadb php 8.0 pre-merge:
paths:
- typo3temp/var/tests/acceptance/typo3temp/var/log
- typo3temp/var/tests/AcceptanceReports
- parallel: 10
+ parallel: 13
script:
- Build/Scripts/runTests.sh -s composerInstall -p 8.0
- Build/Scripts/runTests.sh -s acceptance -p 8.0 -d mariadb -i 10.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
diff --git a/Build/gitlab-ci/pre-merge/functional.yml b/Build/gitlab-ci/pre-merge/functional.yml
index ea68c748ad58..f55a6e355f1b 100644
--- a/Build/gitlab-ci/pre-merge/functional.yml
+++ b/Build/gitlab-ci/pre-merge/functional.yml
@@ -4,7 +4,7 @@ functional mariadb 10.3 php 8.0 pre-merge:
refs:
- schedules
- master
- parallel: 10
+ parallel: 6
script:
- Build/Scripts/runTests.sh -s composerInstall -p 8.0
- Build/Scripts/runTests.sh -s functional -d mariadb -i 10.3 -p 8.0 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
@@ -26,7 +26,7 @@ functional sqlite php 7.4 pre-merge:
refs:
- schedules
- master
- parallel: 10
+ parallel: 5
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.4
- Build/Scripts/runTests.sh -s functional -d sqlite -p 7.4 -c $CI_NODE_INDEX/$CI_NODE_TOTAL
diff --git a/Build/testing-docker/local/docker-compose.yml b/Build/testing-docker/local/docker-compose.yml
index 28b5d7d07fdf..7ad1a89af05a 100644
--- a/Build/testing-docker/local/docker-compose.yml
+++ b/Build/testing-docker/local/docker-compose.yml
@@ -1045,6 +1045,8 @@ services:
functional_sqlite:
image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
user: "${HOST_UID}"
+ tmpfs:
+ - ${CORE_ROOT}/typo3temp/var/tests/functional-sqlite-dbs/:rw,noexec,nosuid,uid=${HOST_UID}
volumes:
- ${CORE_ROOT}:${CORE_ROOT}
- ${HOST_HOME}:${HOST_HOME}
diff --git a/composer.json b/composer.json
index 20f6b6f6a5f2..7c04d0c253c8 100644
--- a/composer.json
+++ b/composer.json
@@ -104,7 +104,7 @@
"phpstan/phpstan": "^0.12.64",
"phpunit/phpunit": "^9.5",
"typo3/cms-styleguide": "~11.4.0",
- "typo3/testing-framework": "^6.9.0"
+ "typo3/testing-framework": "^6.10.0"
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
diff --git a/composer.lock b/composer.lock
index b7e5ab19f553..532dcad27981 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "18ef972ae8ceffb3b4f8e1a1aef18269",
+ "content-hash": "e246c1dc9e21edf07358183d7e687b01",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -8246,20 +8246,22 @@
},
{
"name": "typo3/testing-framework",
- "version": "6.9.0",
+ "version": "6.10.0",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/testing-framework.git",
- "reference": "16ec225d7289caa1e4b9e8c33969dde9034b8613"
+ "reference": "d48c83d816a8426d38ead3fb042ac9c61a851bfd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/16ec225d7289caa1e4b9e8c33969dde9034b8613",
- "reference": "16ec225d7289caa1e4b9e8c33969dde9034b8613",
+ "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/d48c83d816a8426d38ead3fb042ac9c61a851bfd",
+ "reference": "d48c83d816a8426d38ead3fb042ac9c61a851bfd",
"shasum": ""
},
"require": {
+ "guzzlehttp/psr7": "^1.7 || ^2.0",
"mikey179/vfsstream": "~1.6.8",
+ "php": ">= 7.2",
"phpunit/phpunit": "^8.4 || ^9.0",
"psr/container": "^1.0",
"typo3/cms-backend": "10.*.*@dev || 11.*.*@dev",
@@ -8305,9 +8307,9 @@
"support": {
"general": "https://typo3.org/support/",
"issues": "https://github.com/TYPO3/testing-framework/issues",
- "source": "https://github.com/TYPO3/testing-framework/tree/6.9.0"
+ "source": "https://github.com/TYPO3/testing-framework/tree/6.10.0"
},
- "time": "2021-08-06T14:12:49+00:00"
+ "time": "2021-08-29T13:30:52+00:00"
}
],
"aliases": [],
--
GitLab