From 330952733b989df16251010743b86d4a2a20e09f Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Thu, 22 Aug 2024 17:45:20 +0545 Subject: [PATCH] test: allow FakeOffice to work with other file extensions --- .drone.star | 21 --------------------- tests/config/drone/hosting-discovery.xml | 18 +++++++++++------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/.drone.star b/.drone.star index 2a48cd30ac..935694f4fd 100644 --- a/.drone.star +++ b/.drone.star @@ -295,8 +295,6 @@ def main(ctx): licenseCheck(ctx) test_pipelines = \ - buildWebCache(ctx) + \ - getGoBinForTesting(ctx) + \ buildOcisBinaryForTesting(ctx) + \ testPipelines(ctx) @@ -2933,7 +2931,6 @@ def collaborationService(extra_environment = {}): "COLLABORATION_LOG_LEVEL": "debug", "COLLABORATION_HTTP_ADDR": "0.0.0.0:9300", "COLLABORATION_GRPC_ADDR": "0.0.0.0:9301", - # no proof keys available in the FakeOffice "COLLABORATION_APP_PROOF_DISABLE": "true", "COLLABORATION_APP_INSECURE": "true", "COLLABORATION_WOPI_SRC": "http://wopiserver:9300", @@ -2962,24 +2959,6 @@ def collaborationService(extra_environment = {}): "wait-for -it wopiserver:9300 -t 300", ], }, - { - "name": "prepare-test-file", - "image": OC_CI_ALPINE, - "environment": {}, - "commands": [ - "curl -v -X PUT 'https://ocis-server:9200/remote.php/webdav/test.wopitest' -k --fail --retry-connrefused --retry 7 --retry-all-errors -u admin:admin -D headers.txt", - "cat headers.txt", - "export FILE_ID=$(cat headers.txt | sed -n -e 's/^.*Oc-Fileid: //p')", - "export URL=\"https://ocis-server:9200/app/open?app_name=FakeOffice&file_id=$FILE_ID\"", - "export URL=$(echo $URL | tr -d '[:cntrl:]')", - "curl -v -X POST \"$URL\" -k --fail --retry-connrefused --retry 7 --retry-all-errors -u admin:admin > open.json", - "cat open.json", - "cat open.json | jq .form_parameters.access_token | tr -d '\"' > accesstoken", - "cat open.json | jq .form_parameters.access_token_ttl | tr -d '\"' > accesstokenttl", - "echo -n 'http://wopiserver:9300/wopi/files/' > wopisrc", - "cat open.json | jq .app_url | sed -n -e 's/^.*files%2F//p' | tr -d '\"' >> wopisrc", - ], - }, ] def tikaService(): diff --git a/tests/config/drone/hosting-discovery.xml b/tests/config/drone/hosting-discovery.xml index f663da91da..9dbe99100b 100644 --- a/tests/config/drone/hosting-discovery.xml +++ b/tests/config/drone/hosting-discovery.xml @@ -1,8 +1,12 @@ - - - - - - - + + + + + + + + + + + \ No newline at end of file