From a34c6c42a816491761868edb90c36b22e6a81df1 Mon Sep 17 00:00:00 2001 From: amrita Date: Thu, 27 Apr 2023 16:27:39 +0545 Subject: [PATCH] Remove tag skipOnOcis notToImplementOnOCIS oImplementOnOCIS comments-app-required federation-app-required notifications-app-required systemtags-app-required local_storage --- .drone.star | 2 +- tests/acceptance/docker/src/run-tests.sh | 2 +- .../features/bootstrap/FeatureContext.php | 29 ------------------- .../trashbinFilesFolders.feature | 2 +- .../trashbinRestore.feature | 4 +-- 5 files changed, 5 insertions(+), 34 deletions(-) diff --git a/.drone.star b/.drone.star index 3289e26b109..881106ef068 100644 --- a/.drone.star +++ b/.drone.star @@ -962,7 +962,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", accounts_hash_difficulty = 4): early_fail = config["apiTests"]["earlyFail"] if "earlyFail" in config["apiTests"] else False - filterTags = "~@skipOnGraph&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-%s-Storage&&~@caldav&&~@carddav" % ("OC" if storage == "owncloud" else "OCIS") + filterTags = "~@skipOnGraph&&~@skipOnOcis-%s-Storage&&~@caldav&&~@carddav" % ("OC" if storage == "owncloud" else "OCIS") expectedFailuresFile = "%s/tests/acceptance/expected-failures-API-on-%s-storage.md" % (dirs["base"], storage.upper()) return { diff --git a/tests/acceptance/docker/src/run-tests.sh b/tests/acceptance/docker/src/run-tests.sh index b75649a179f..2c765589472 100644 --- a/tests/acceptance/docker/src/run-tests.sh +++ b/tests/acceptance/docker/src/run-tests.sh @@ -12,7 +12,7 @@ then if [ "$STORAGE_DRIVER" = "ocis" ] then export OCIS_REVA_DATA_ROOT='' - export BEHAT_FILTER_TAGS='~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage' + export BEHAT_FILTER_TAGS='~@skipOnOcis-OCIS-Storage' export OCIS_SKELETON_STRATEGY='upload' export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OCIS-storage.md' elif [ "$STORAGE_DRIVER" = "s3ng" ] diff --git a/tests/acceptance/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php index 82e6973cf05..ca96ec20d00 100644 --- a/tests/acceptance/features/bootstrap/FeatureContext.php +++ b/tests/acceptance/features/bootstrap/FeatureContext.php @@ -3668,20 +3668,6 @@ public function setCapabilities(array $capabilitiesArray): void { ); } - /** - * After Scenario. restore trusted servers - * - * @AfterScenario @federation-app-required - * - * @return void - */ - public function restoreTrustedServersAfterScenario(): void { - $this->restoreTrustedServers('LOCAL'); - if ($this->federatedServerExists()) { - $this->restoreTrustedServers('REMOTE'); - } - } - /** * @param string $sourceUser * @param string $targetUser @@ -3817,21 +3803,6 @@ public function getBodyForOCSRequest(string $method, string $property): ?string return $body; } - /** - * Before Scenario to Save trusted Servers - * - * @BeforeScenario @federation-app-required - * - * @return void - * @throws Exception - */ - public function setInitialTrustedServersBeforeScenario(): void { - $this->initialTrustedServer = [ - 'LOCAL' => $this->getTrustedServers(), - 'REMOTE' => $this->getTrustedServers('REMOTE') - ]; - } - /** * The method returns userId * diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature index 2ebcba8e34b..41b954995d9 100644 --- a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature +++ b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature @@ -158,7 +158,7 @@ Feature: files and folders exist in the trashbin after being deleted | dav-path | | spaces | - @local_storage @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore + @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore Scenario Outline: Deleting a folder into external storage moves it to the trashbin Given using DAV path And user "Alice" has created folder "/local_storage/tmp" diff --git a/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature b/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature index b538d7befe5..cd8f08bf6cd 100644 --- a/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature +++ b/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature @@ -130,7 +130,7 @@ Feature: Restore deleted files/folders | old | | new | - @local_storage @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore + @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore Scenario Outline: Deleting a file into external storage moves it to the trashbin and can be restored Given using DAV path And user "Alice" has created folder "/local_storage/tmp" @@ -152,7 +152,7 @@ Feature: Restore deleted files/folders | old | | new | - @local_storage @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore + @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore Scenario: Deleting an updated file into external storage moves it to the trashbin and can be restored Given using old DAV path And user "Alice" has created folder "/local_storage/tmp"