Merge pull request #2540 from timdreier/2441-fix-automated-tests-mac

fix: replace --delete-delay by --delete-before to work on macos

.changelog/current/2540-allow-mac-automated-builds.md

@@ -0,0 +1,4 @@
+# Maintenance
+
+- Make the automated test compatible with MacOS
+

.github/actions/run-tests/reset-from-container.sh

@@ -82,7 +82,7 @@ start_container() {
 restore_db_synced_data() {
 	local db_path="/db/${1}"
 	echo "Restoring synced DB data from $SF_DIR/sql to $db_path"
-	sudo rsync -a --delete --delete-delay "$SF_DIR/sql/" "$db_path"
+	sudo rsync -a --delete "$SF_DIR/sql/" "$db_path"
 }
 
 test_mysql_is_running() {
@@ -129,7 +129,7 @@ restore_postgres_sync () {
 # exec >> /output/reset.log 2>&1
 
 echo "Cloning data files"
-rsync --archive --delete --delete-delay "$SF_DIR/data/" /var/www/html/data/
+rsync --archive --delete "$SF_DIR/data/" /var/www/html/data/
 
 echo "Restoring DB"
 case "$INPUT_DB" in

.github/actions/run-tests/test_runner/dumps.py

@@ -16,7 +16,7 @@ except ImportError:
 
 class SubFixture:
 	
-	rsyncArgs = ['--delete', '--delete-delay', '--delete-excluded', '--archive']
+	rsyncArgs = ['--delete', '--delete-excluded', '--archive']
 
 	def __init__(self):
 		pass

.github/actions/run-tests/test_runner/test_env.py

@@ -225,7 +225,7 @@ class Environment:
 		excludePairs = [['--exclude', x] for x in excludes]
 		excludeParams = [x for pair in excludePairs for x in pair]
 		p.pr.run(
-			['rsync', '-a', '../../../', 'volumes/cookbook', '--delete', '--delete-delay'] + excludeParams
+			['rsync', '-a', '../../../', 'volumes/cookbook', '--delete'] + excludeParams
 		).check_returncode()
 
 		l.logger.printTask('Making appinfo file')

.github/actions/run-tests/tests/entrypoints/test.sh

@@ -59,7 +59,7 @@ export QUICK_MODE
 printCI "::group::Test prepatation in container"
 
 echo "Synchronizing cookbook codebase"
-rsync -a /cookbook/ custom_apps/cookbook/ --delete --delete-delay --delete-excluded --exclude /.git --exclude /.github/actions/run-tests/volumes --exclude /docs --exclude /node_modules/
+rsync -a /cookbook/ custom_apps/cookbook/ --delete --delete-excluded --exclude /.git --exclude /.github/actions/run-tests/volumes --exclude /docs --exclude /node_modules/
 
 pushd custom_apps/cookbook