Adjust expected failures

Less failures due to reva upgrade. See owncloud/ocis#1372
owncloud · Jan 21, 2021 · 7a2e235 · 7a2e235
1 parent a5f4dfa
commit 7a2e235
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/.drone.env b/.drone.env
@@ -1,3 +1,3 @@
 # The version of OCIS to use in pipelines that test against OCIS
-OCIS_COMMITID=6fdb44c687808594e27231844655c8c8da4be46c
-OCIS_BRANCH=master
+OCIS_COMMITID=702b7404d004dd55e16d8377504b667050e5c0c4
+OCIS_BRANCH=update-reva-1.5.1
diff --git a/tests/acceptance/expected-failures-with-ocis-server-owncloud-storage.md b/tests/acceptance/expected-failures-with-ocis-server-owncloud-storage.md
@@ -391,9 +391,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUITrashbinDelete/trashbinDelete.feature:66](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L66)
 -   [webUITrashbinDelete/trashbinDelete.feature:93](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L93)
 
-### [Trashbin fails with unknown error when restoring](https://github.com/owncloud/product/issues/139)
--   [webUITrashbinDelete/trashbinDelete.feature:114](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L114)
-
 ### [Propfind response to trashbin endpoint is different in ocis](https://github.com/owncloud/product/issues/186)
 ### [restoring a file from "Deleted files" (trashbin) is not possible if the original folder does not exist any-more](https://github.com/owncloud/web/issues/1753)
 -   [webUITrashbinRestore/trashbinRestore.feature:123](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature#L123)

diff --git a/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature b/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature
@@ -115,11 +115,3 @@ Feature: files and folders can be deleted from the trashbin
     When the user clears the trashbin
     Then the success message with header "All deleted files were removed" should be displayed on the webUI
     And there should be no resources listed on the webUI
-
-  @skipOnOC10 @issue-product-139
-  # after the issue is fixed delete this scenario and use the one above
-  Scenario: Clear trashbin
-    When the user clears the trashbin
-    Then the error message with header "Could not delete files" should be displayed on the webUI
-    And file "lorem.txt" should be listed on the webUI
-    And folder "simple-folder" should be listed on the webUI