Remove tag skipOnOcis notToImplementOnOCIS oImplementOnOCIS comments-app-required federation-app-required notifications-app-required systemtags-app-required local_storage

This commit is contained in:
amrita
2023-05-04 12:42:14 +05:45
parent bc2a74c895
commit a34c6c42a8
5 changed files with 5 additions and 34 deletions
+1 -1
View File
@@ -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): 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 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()) expectedFailuresFile = "%s/tests/acceptance/expected-failures-API-on-%s-storage.md" % (dirs["base"], storage.upper())
return { return {
+1 -1
View File
@@ -12,7 +12,7 @@ then
if [ "$STORAGE_DRIVER" = "ocis" ] if [ "$STORAGE_DRIVER" = "ocis" ]
then then
export OCIS_REVA_DATA_ROOT='' 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 OCIS_SKELETON_STRATEGY='upload'
export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OCIS-storage.md' export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OCIS-storage.md'
elif [ "$STORAGE_DRIVER" = "s3ng" ] elif [ "$STORAGE_DRIVER" = "s3ng" ]
@@ -3668,20 +3668,6 @@ class FeatureContext extends BehatVariablesContext {
); );
} }
/**
* 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 $sourceUser
* @param string $targetUser * @param string $targetUser
@@ -3817,21 +3803,6 @@ class FeatureContext extends BehatVariablesContext {
return $body; 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 * The method returns userId
* *
@@ -158,7 +158,7 @@ Feature: files and folders exist in the trashbin after being deleted
| dav-path | | dav-path |
| spaces | | 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 Scenario Outline: Deleting a folder into external storage moves it to the trashbin
Given using <dav-path> DAV path Given using <dav-path> DAV path
And user "Alice" has created folder "/local_storage/tmp" And user "Alice" has created folder "/local_storage/tmp"
@@ -130,7 +130,7 @@ Feature: Restore deleted files/folders
| old | | old |
| new | | 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 Scenario Outline: Deleting a file into external storage moves it to the trashbin and can be restored
Given using <dav-path> DAV path Given using <dav-path> DAV path
And user "Alice" has created folder "/local_storage/tmp" And user "Alice" has created folder "/local_storage/tmp"
@@ -152,7 +152,7 @@ Feature: Restore deleted files/folders
| old | | old |
| new | | 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 Scenario: Deleting an updated file into external storage moves it to the trashbin and can be restored
Given using old DAV path Given using old DAV path
And user "Alice" has created folder "/local_storage/tmp" And user "Alice" has created folder "/local_storage/tmp"