sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up and refactor on

Browse Source
This commit is contained in:
Willy Kloucek
2021-05-26 16:31:54 +02:00
parent b575e93cdf
commit 796376586b
4 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/acceptance/docker/src/acceptance.yml
+1 -2
View File
@@ -11,8 +11,7 @@ services:
TEST_SERVER_URL: https://ocis-server:9200
TESTING_DIR: /srv/app/tmp/testing
STORAGE_DRIVER: $STORAGE
STORAGE: $STORAGE
STORAGE_DRIVER: $STORAGE_DRIVER
TEST_SOURCE: $TEST_SOURCE
BEHAT_SUITE: ${BEHAT_SUITE:-}
BEHAT_FEATURE: ${BEHAT_FEATURE:-}
tests/acceptance/docker/src/ocis-base.yml
+3 -2
View File
@@ -1,8 +1,9 @@
services:
ocis-server:
environment:
STORAGE_HOME_DRIVER: $STORAGE
STORAGE_USERS_DRIVER: $STORAGE
OCIS_URL: "https://ocis-server:9200"
STORAGE_HOME_DRIVER: $STORAGE_DRIVER
STORAGE_USERS_DRIVER: $STORAGE_DRIVER
STORAGE_DRIVER_OCIS_ROOT: /srv/app/tmp/ocis/storage/users
STORAGE_DRIVER_LOCAL_ROOT: /srv/app/tmp/ocis/local/root
STORAGE_METADATA_ROOT: /srv/app/tmp/ocis/metadata
tests/acceptance/docker/src/run-tests.sh
+6 -17
View File
@@ -26,13 +26,13 @@ fi
if [ "$TEST_SOURCE" = "oc10" ]
then
if [ "$STORAGE" = "owncloud" ]
if [ "$STORAGE_DRIVER" = "owncloud" ]
then
export OCIS_REVA_DATA_ROOT='/srv/app/tmp/ocis/owncloud/data/'
export BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-OC-Storage'
export OCIS_SKELETON_STRATEGY='copy'
export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md'
elif [ "$STORAGE" = "ocis" ]
elif [ "$STORAGE_DRIVER" = "ocis" ]
then
export OCIS_REVA_DATA_ROOT=''
export BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage'
@@ -48,18 +48,17 @@ then
elif [ "$TEST_SOURCE" = "ocis" ]
then
if [ "$STORAGE" = "owncloud" ]
if [ "$STORAGE_DRIVER" = "owncloud" ]
then
export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-OC-Storage'
export OCIS_REVA_DATA_ROOT='/srv/app/tmp/ocis/owncloud/data/'
export OCIS_SKELETON_STRATEGY='copy'
elif [ "$STORAGE" = "ocis" ]
elif [ "$STORAGE_DRIVER" = "ocis" ]
then
export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-OCIS-Storage'
#export OCIS_REVA_DATA_ROOT='/srv/app/tmp/ocis/owncloud/data'
export OCIS_REVA_DATA_ROOT=''
export OCIS_SKELETON_STRATEGY='upload'
elif [ "$STORAGE" = "s3ng" ]
elif [ "$STORAGE_DRIVER" = "s3ng" ]
then
export BEHAT_FILTER_TAGS='~@skip&&~@skipOnOcis-S3NG-Storage'
export OCIS_REVA_DATA_ROOT=''
@@ -89,16 +88,6 @@ else
unset BEHAT_FEATURE
fi
echo "#################"
echo "#################"
echo "#################"
echo "#################"
printenv
echo "#################"
echo "#################"
echo "#################"
echo "#################"
## RUN TEST
if [ "$TEST_SOURCE" = "oc10" ]
@@ -108,7 +97,7 @@ elif [ "$TEST_SOURCE" = "ocis" ]
then
cd $OCIS_ROOT
sleep 10
make -C /drone/src test-acceptance-api
make test-acceptance-api
else
echo "non existing TEST_SOURCE selected"
exit 1