From 892d2f7e89f46f6ffed0b2d808c1468326962d89 Mon Sep 17 00:00:00 2001 From: Swikriti Tripathi Date: Wed, 4 Aug 2021 13:24:44 +0545 Subject: [PATCH] Remove local previews tests,clean up and bump core commit id --- .drone.env | 2 +- .drone.star | 64 +---------- tests/acceptance/config/behat.yml | 27 ----- .../apiWebdavPreviews-previews.feature | 104 ------------------ 4 files changed, 2 insertions(+), 195 deletions(-) delete mode 100644 tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature diff --git a/.drone.env b/.drone.env index 5bacc5fa5d..890d9041ab 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The test runner source for API tests -CORE_COMMITID=de8b5a6256e6c4c358e913a4c3deb418fa1105cf +CORE_COMMITID=83a407af2fbabc6cd6bb2d6b9abfe62e85d2da64 CORE_BRANCH=master diff --git a/.drone.star b/.drone.star index 56e3daae1d..f296b9333f 100644 --- a/.drone.star +++ b/.drone.star @@ -94,7 +94,7 @@ def cephService(): def main(ctx): # In order to run specific parts only, specify the parts as # ocisIntegrationTests(6, [1, 4]) - this will only run 1st and 4th parts - # implemented for: ocisIntegrationTests, owncloudIntegrationTests and s3ngIntegrationTests + # implemented for: ocisIntegrationTests and s3ngIntegrationTests return [ buildAndPublishDocker(), buildOnly(), @@ -102,7 +102,6 @@ def main(ctx): release(), litmusOcisOldWebdav(), litmusOcisNewWebdav(), - localIntegrationTestsOcis(), ] + ocisIntegrationTests(6) + s3ngIntegrationTests(12) @@ -518,67 +517,6 @@ def litmusOcisNewWebdav(): ], } -def localIntegrationTestsOcis(): - return { - "kind": "pipeline", - "type": "docker", - "name": "local-integration-tests-ocis", - "platform": { - "os": "linux", - "arch": "amd64", - }, - "trigger": { - "event": { - "include": [ - "pull_request", - "tag", - ], - }, - }, - "steps": [ - makeStep("build-ci"), - { - "name": "revad-services", - "image": "registry.cern.ch/docker.io/library/golang:1.16", - "detach": True, - "commands": [ - "cd /drone/src/tests/oc-integration-tests/drone/", - "/drone/src/cmd/revad/revad -c frontend.toml &", - "/drone/src/cmd/revad/revad -c gateway.toml &", - "/drone/src/cmd/revad/revad -c shares.toml &", - "/drone/src/cmd/revad/revad -c storage-home-ocis.toml &", - "/drone/src/cmd/revad/revad -c storage-oc-ocis.toml &", - "/drone/src/cmd/revad/revad -c storage-publiclink-ocis.toml &", - "/drone/src/cmd/revad/revad -c ldap-users.toml", - ], - }, - cloneOc10TestReposStep(), - { - "name": "localAPIAcceptanceTestsOcisStorage", - "image": "registry.cern.ch/docker.io/owncloudci/php:7.4", - "commands": [ - "make test-acceptance-api", - ], - "environment": { - "TEST_SERVER_URL": "http://revad-services:20080", - "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/", - "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-*", - "STORAGE_DRIVER": "OCIS", - "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton", - "TEST_WITH_LDAP": "true", - "REVA_LDAP_HOSTNAME": "ldap", - "TEST_REVA": "true", - "SEND_SCENARIO_LINE_REFERENCES": "true", - "BEHAT_FILTER_TAGS": "~@skipOnOcis-OCIS-Storage", - "PATH_TO_CORE": "/drone/src/tmp/testrunner", - } - }, - ], - "services": [ - ldapService(), - ], - } - def ocisIntegrationTests(parallelRuns, skipExceptParts = []): pipelines = [] debugPartsEnabled = (len(skipExceptParts) != 0) diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index 1e3eb22291..c75fd5d367 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -2,33 +2,6 @@ default: autoload: '': '%paths.base%/../features/bootstrap' - suites: - apiOcisSpecific: - paths: - - '%paths.base%/../features/apiOcisSpecific' - context: &common_ldap_suite_context - parameters: - ldapAdminPassword: admin - ldapUsersOU: TestUsers - ldapGroupsOU: TestGroups - ldapInitialUserFilePath: /../../config/ldap-users.ldif - contexts: - - RevaContext: - - OccContext: - - FeatureContext: &common_feature_context_params - baseUrl: http://localhost:8080 - adminUsername: admin - adminPassword: admin - regularUserPassword: 123456 - ocPath: apps/testing/api/v1/occ - - CapabilitiesContext: - - ChecksumContext: - - FavoritesContext: - - FilesVersionsContext: - - PublicWebDavContext: - - TrashbinContext: - - WebDavPropertiesContext: - extensions: jarnaiz\JUnitFormatter\JUnitFormatterExtension: filename: report.xml diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature deleted file mode 100644 index 46be01e018..0000000000 --- a/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature +++ /dev/null @@ -1,104 +0,0 @@ -@api @issue-ocis-187 -Feature: previews of files downloaded through the webdav API - - Background: - Given user "Alice" has been created with default attributes and without skeleton files - - @issue-ocis-188 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario Outline: download previews with invalid width - Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - When user "Alice" downloads the preview of "/parent.txt" with width "" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - Examples: - | width | - | 0 | - | 0.5 | - | -1 | - | false | - | true | - | A | - | %2F | - - @issue-ocis-188 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario Outline: download previews with invalid height - Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - When user "Alice" downloads the preview of "/parent.txt" with width "32" and height "" using the WebDAV API - Then the HTTP status code should be "200" - Examples: - | height | - | 0 | - | 0.5 | - | -1 | - | false | - | true | - | A | - | %2F | - - @issue-ocis-189 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario Outline: download previews of file types that don't support preview - Given user "Alice" has uploaded file "filesForUpload/" to "/" - When user "Alice" downloads the preview of "/" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - Examples: - | filename | newfilename | - | simple.pdf | test.pdf | - | simple.odt | test.odt | - | new-data.zip | test.zip | - - @issue-ocis-187 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario Outline: download previews of different image file types - Given user "Alice" has uploaded file "filesForUpload/" to "/" - When user "Alice" downloads the preview of "/" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - And the downloaded image should be "1240" pixels wide and "648" pixels high - Examples: - | imageName | newImageName | - | testavatar.jpg | testimage.jpg | - | testavatar.png | testimage.png | - - @issue-ocis-187 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: download previews of image after renaming it - Given user "Alice" has uploaded file "filesForUpload/testavatar.jpg" to "/testimage.jpg" - When user "Alice" moves file "/testimage.jpg" to "/testimage.txt" using the WebDAV API - And user "Alice" downloads the preview of "/testimage.txt" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - And the downloaded image should be "1240" pixels wide and "648" pixels high - - @issue-ocis-190 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: download previews of folders - Given user "Alice" has created folder "subfolder" - When user "Alice" downloads the preview of "/subfolder/" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "501" - - @issue-ocis-192 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: Download file previews when it is disabled by the administrator - Given the administrator has updated system config key "enable_previews" with value "false" and type "boolean" - And user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - When user "Alice" downloads the preview of "/parent.txt" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - - @issue-ocis-193 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: unset maximum size of previews - Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - And the administrator has updated system config key "preview_max_x" with value "null" - And the administrator has updated system config key "preview_max_y" with value "null" - When user "Alice" downloads the preview of "/parent.txt" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - - @issue-ocis-193 @skipOnOcis-OCIS-Storage - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: set maximum size of previews - Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - When the administrator updates system config key "preview_max_x" with value "null" using the occ command - And the administrator updates system config key "preview_max_y" with value "null" using the occ command - Then the HTTP status code should be "201" - When user "Alice" downloads the preview of "/parent.txt" with width "null" and height "null" using the WebDAV API - Then the HTTP status code should be "200"