Merge pull request #37296 from owncloud/apiVersionsTestsWithOracleDB

[Tests-Only] Run apiVersions test on Oracle db
owncloud · Apr 23, 2020 · c9eb843 · c9eb843
2 parents a60b623 + 438511c
commit c9eb843
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/.drone.star b/.drone.star
@@ -113,6 +113,13 @@ config = {
 				'apiWebdavUpload2',
 			],
 		},
+		'apiOnOracle': {
+		    'suites': [
+		        'apiVersions',
+		    ],
+		    'filterTags': '@skip&&@issue-37026',
+		    'databases': ['oracle'],
+		},
 		'apiNotifications': {
 			'suites': [
 				'apiSharingNotifications',

diff --git a/tests/acceptance/features/apiVersions/fileVersions.feature b/tests/acceptance/features/apiVersions/fileVersions.feature
@@ -129,7 +129,7 @@ Feature: dav-versions
     Then the content of file "/textfile0.txt" for user "user0" should be "Dav-Test"
 
   @skipOnStorage:ceph @skipOnStorage:scality @files_primary_s3-issue-156
-  @skipOnOcis @issue-ocis-reva-57
+  @skipOnOcis @issue-ocis-reva-57 @skipOnOracle
   Scenario: Restore a file and check, if the content and correct checksum is now in the current file
     Given user "user0" has uploaded file with content "AAAAABBBBBCCCCC" and checksum "MD5:45a72715acdd5019c5be30bdbb75233e" to "/davtest.txt"
     And user "user0" has uploaded file "filesForUpload/textfile.txt" to "/davtest.txt" with checksum "MD5:d70b40f177b14b470d1756a3c12b963a"
@@ -138,6 +138,16 @@ Feature: dav-versions
     Then the content of file "/davtest.txt" for user "user0" should be "AAAAABBBBBCCCCC"
     And as user "user0" the webdav checksum of "/davtest.txt" via propfind should match "SHA1:acfa6b1565f9710d4d497c6035d5c069bd35a8e8 MD5:45a72715acdd5019c5be30bdbb75233e ADLER32:1ecd03df"
 
+  @skipOnStorage:ceph @skipOnStorage:scality @files_primary_s3-issue-156
+  @skipOnOcis @issue-ocis-reva-57 @skip @issue-37026
+  Scenario: Restore a file and check, if the content and correct checksum is now in the current file
+    Given user "user0" has uploaded file with content "AAAAABBBBBCCCCC" and checksum "MD5:45a72715acdd5019c5be30bdbb75233e" to "/davtest.txt"
+    And user "user0" has uploaded file "filesForUpload/textfile.txt" to "/davtest.txt" with checksum "MD5:d70b40f177b14b470d1756a3c12b963a"
+    And the version folder of file "/davtest.txt" for user "user0" should contain "1" element
+    When user "user0" restores version index "1" of file "/davtest.txt" using the WebDAV API
+    Then the content of file "/davtest.txt" for user "user0" should be "AAAAABBBBBCCCCC"
+    And as user "user0" the webdav checksum of "/davtest.txt" via propfind should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f MD5:d70b40f177b14b470d1756a3c12b963a ADLER32:8ae90960"
+
   Scenario: User cannot access meta folder of a file which is owned by somebody else
     Given user "user1" has been created with default attributes and without skeleton files
     And user "user0" has uploaded file with content "123" to "/davtest.txt"

diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh
@@ -898,7 +898,12 @@ fi
 # If the caller did not mention specific tags, skip the skipped tests by default
 if [ "${BEHAT_TAGS_OPTION_FOUND}" = false ]
 then
-	BEHAT_FILTER_TAGS="${BEHAT_FILTER_TAGS}&&~@skip"
+  #  If the caller has already specified specifically to run "@skip" scenarios
+  #  then do not append "not @skip"
+  if [[ ! ${BEHAT_FILTER_TAGS} =~ "&&@skip&&" ]]
+  then
+	  BEHAT_FILTER_TAGS="${BEHAT_FILTER_TAGS}&&~@skip"
+  fi
 fi
 
 if [ -n "${BROWSER_VERSION}" ]