diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-04-05 10:00:37 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-04-05 10:00:37 +0200 |
| commit | 2a7e9f08ff5951c0fba8524ba76fe56ce95ada57 (patch) | |
| tree | 08ee1dd6752c44d07819924a8ddea8264a935041 | |
| parent | 961bb4c3e3cb944cb61c7331399a1d2bc9e51f6d (diff) | |
| parent | d47824f4cf9ca74c5fda6896f4e93a3f5f1629d5 (diff) | |
| download | nextcloud-server-2a7e9f08ff5951c0fba8524ba76fe56ce95ada57.tar.gz nextcloud-server-2a7e9f08ff5951c0fba8524ba76fe56ce95ada57.zip | |
Merge pull request #23791 from owncloud/fix-swift-test-mkfifo
Remove any stray socket files before creating new ones
| -rwxr-xr-x | apps/files_external/tests/env/start-amazons3-ceph.sh | 1 | ||||
| -rwxr-xr-x | apps/files_external/tests/env/start-swift-ceph.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/files_external/tests/env/start-amazons3-ceph.sh b/apps/files_external/tests/env/start-amazons3-ceph.sh index d36980fdd11..1aa14ac990d 100755 --- a/apps/files_external/tests/env/start-amazons3-ceph.sh +++ b/apps/files_external/tests/env/start-amazons3-ceph.sh @@ -33,6 +33,7 @@ fi; # create readiness notification socket notify_sock=$(readlink -f "$thisFolder"/dockerContainerCeph.$EXECUTOR_NUMBER.amazons3.sock) +rm -f "$notify_sock" # in case an unfinished test left one behind mkfifo "$notify_sock" user=test diff --git a/apps/files_external/tests/env/start-swift-ceph.sh b/apps/files_external/tests/env/start-swift-ceph.sh index e884087c248..1e417c69057 100755 --- a/apps/files_external/tests/env/start-swift-ceph.sh +++ b/apps/files_external/tests/env/start-swift-ceph.sh @@ -33,6 +33,7 @@ fi; # create readiness notification socket notify_sock=$(readlink -f "$thisFolder"/dockerContainerCeph.$EXECUTOR_NUMBER.swift.sock) +rm -f "$notify_sock" # in case an unfinished test left one behind mkfifo "$notify_sock" port=5001 |