diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2018-09-19 12:43:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 12:43:44 +0200 |
| commit | b75dde0c9a218f6154158d7fe54fd38d774a1970 (patch) | |
| tree | b7e1ac71da842443dc81cbbb2f79e11aea2fc6c6 | |
| parent | 06141b2b8adf2cc56c7ff9bf6fc6c94c1db8c4f2 (diff) | |
| parent | bc84aa0269aa5e32b1287f66c6a2db18f2b3d8fa (diff) | |
| download | nextcloud-server-b75dde0c9a218f6154158d7fe54fd38d774a1970.tar.gz nextcloud-server-b75dde0c9a218f6154158d7fe54fd38d774a1970.zip | |
Merge pull request #11268 from nextcloud/include-empty-directories-in-the-default-state-of-acceptance-tests
Include empty directories in the default state of acceptance tests
| -rwxr-xr-x | tests/acceptance/run-local.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh index e924bd94f3f..7ae6705000c 100755 --- a/tests/acceptance/run-local.sh +++ b/tests/acceptance/run-local.sh @@ -206,6 +206,8 @@ su --shell /bin/bash --login www-data --command "cd $NEXTCLOUD_DIR && $ACCEPTANC echo "Saving the default state so acceptance tests can reset to it" find . -name ".gitignore" -exec rm --force {} \; +# Create dummy files in empty directories to force Git to save the directories. +find . -not -path "*.git*" -type d -empty -exec touch {}/.keep \; git add --all && echo 'Default state' | git -c user.name='John Doe' -c user.email='john@doe.org' commit --quiet --file=- cd tests/acceptance |