From b501e73a89e38c869f88711043610f049f18fe51 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 11 Sep 2020 11:47:49 +0545 Subject: [PATCH] skip only those local tests that fail --- .../apiShareManagementBasic-createShare.feature | 2 +- .../apiSharePublicLink1-createPublicLinkShare.feature | 4 ++-- .../apiSharePublicLink2-copyFromPublicLink.feature | 8 ++++---- .../apiOcisSpecific/apiShareUpdate-updateShare.feature | 2 +- .../apiOcisSpecific/apiTrashbin-trashbinDelete.feature | 1 + .../apiWebdavMove1-moveFolderToBlacklistedName.feature | 2 +- .../apiWebdavProperties1-createFolder.feature | 2 +- .../apiWebdavProperties2-getFileProperties.feature | 4 ++-- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature b/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature index a1c6880e2..772938353 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature @@ -83,7 +83,7 @@ Feature: sharing | 1 | 100 | | 2 | 200 | - @issue-ocis-reva-372 @issue-ocis-reva-243 + @issue-ocis-reva-372 @issue-ocis-reva-243 @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario Outline: sharing subfolder of already shared folder, GET result is correct Given using OCS API version "" diff --git a/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature b/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature index 235effb6a..227bbce62 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature @@ -5,7 +5,7 @@ Feature: create a public link share Background: Given user "Alice" has been created with default attributes and skeleton files - @issue-37605 + @issue-37605 @skipOnOcis-OCIS-Storage # after fixing all issues make the oC10 scenario like this one, and delete this scenario Scenario: Get the mtime of a file inside a folder shared by public link using new webDAV version (run on OCIS) Given user "Alice" has created folder "testFolder" @@ -17,7 +17,7 @@ Feature: create a public link share And as "Alice" the mtime of the file "testFolder/file.txt" should be "Thu, 08 Aug 2019 04:18:13 GMT" And the mtime of file "file.txt" in the last shared public link using the WebDAV API should be "Thu, 08 Aug 2019 04:18:13 GMT" - @issue-37605 + @issue-37605 @skipOnOcis-OCIS-Storage # after fixing all issues make the oC10 scenario like this one, and delete this scenario Scenario: overwriting a file changes its mtime (new public webDAV API) (run on OCIS) Given user "Alice" has created folder "testFolder" diff --git a/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature b/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature index 598f75155..c364374c8 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature @@ -6,7 +6,7 @@ Feature: copying from public link share And user "Alice" has created folder "/PARENT" And the administrator has enabled DAV tech_preview - @issue-ocis-reva-373 @issue-core-37683 + @issue-ocis-reva-373 @issue-core-37683 @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: Copy folder within a public link folder to the same folder name as an already existing file Given user "Alice" has created folder "/PARENT/testFolder" @@ -22,7 +22,7 @@ Feature: copying from public link share And the content of file "/PARENT/testFolder/testfile.txt" for user "Alice" should be "some data" And the content of file "/PARENT/copy1.txt" for user "Alice" should be "some data 1" - @issue-ocis-reva-373 @issue-core-37683 + @issue-ocis-reva-373 @issue-core-37683 @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: Copy file within a public link folder to a file with name same as an existing folder Given user "Alice" has uploaded file with content "some data" to "/PARENT/testfile.txt" @@ -37,7 +37,7 @@ Feature: copying from public link share And as "Alice" file "/PARENT/new-folder" should exist And the content of file "/PARENT/testfile.txt" for user "Alice" should be "some data" - @issue-ocis-reva-368 + @issue-ocis-reva-368 @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario Outline: Copy file within a public link folder to a file with unusual destination names Given user "Alice" has uploaded file with content "some data" to "/PARENT/testfile.txt" @@ -53,7 +53,7 @@ Feature: copying from public link share | testfile.txt | | | - @issue-ocis-reva-368 + @issue-ocis-reva-368 @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: Copy folder within a public link folder to a folder with unusual destination names Given user "Alice" has created folder "/PARENT/testFolder" diff --git a/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature b/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature index 3beddab01..f44db6d51 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature @@ -5,7 +5,7 @@ Feature: sharing Given using OCS API version "1" And user "Alice" has been created with default attributes and skeleton files - @skipOnOcis-EOS-Storage @toFixOnOCIS @issue-ocis-reva-243 + @skipOnOcis-EOS-Storage @toFixOnOCIS @issue-ocis-reva-243 @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: Share ownership change after moving a shared file to another share Given these users have been created with default attributes and without skeleton files: diff --git a/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature b/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature index c63c4f5f6..419083598 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature @@ -40,6 +40,7 @@ Feature: files and folders can be deleted from the trashbin @smokeTest @issue-ocis-reva-118 @issue-product-179 + @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: delete a single file from the trashbin Given user "Alice" has deleted file "/textfile0.txt" diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature index 7a7701a7c..3d1289d8b 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature @@ -8,7 +8,7 @@ Feature: users cannot move (rename) a folder to a blacklisted name Given using OCS API version "1" And user "Alice" has been created with default attributes and without skeleton files - @issue-ocis-reva-211 @skipOnOcis-EOS-Storage @issue-ocis-reva-269 + @issue-ocis-reva-211 @skipOnOcis-EOS-Storage @issue-ocis-reva-269 @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario Outline: Renaming a folder to a name that is banned by default is allowed Given using DAV path diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature index c7b96e90f..47a0b94ff 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature @@ -8,7 +8,7 @@ Feature: create folder Given using OCS API version "1" And user "Alice" has been created with default attributes and without skeleton files - @issue-ocis-reva-168 @skipOnOcis-EOS-Storage + @issue-ocis-reva-168 @skipOnOcis-EOS-Storage @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario Outline: try to create a folder that already exists Given using DAV path diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature index af5fee43f..bed40e5c9 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature @@ -8,7 +8,7 @@ Feature: get file properties Given using OCS API version "1" And user "Alice" has been created with default attributes and without skeleton files - @issue-ocis-reva-214 + @issue-ocis-reva-214 @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario Outline: Do a PROPFIND of various file names Given using DAV path @@ -25,7 +25,7 @@ Feature: get file properties | new | /file #2.txt | dav\/files\/%username%\/file%20%232\.txt | | new | /file &2.txt | dav\/files\/%username%\/file%20&2\.txt | - @issue-ocis-reva-214 @issue-ocis-reva-265 @skipOnOcis-EOS-Storage + @issue-ocis-reva-214 @issue-ocis-reva-265 @skipOnOcis-EOS-Storage @skipOnOcis-OCIS-Storage # after fixing all issues delete this Scenario and use the one from oC10 core Scenario Outline: Do a PROPFIND of various file names Given using DAV path