From 541f0477314db99979c1460123a630b467ddfc83 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 5 Aug 2020 13:30:34 +0545 Subject: [PATCH 1/3] Bump core commit to match core 10.5.1 bump --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 2a91e8157..d7abfa3b3 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ config = { 'apiTests': { 'coreBranch': 'master', - 'coreCommit': '1bee9ca8bc5ca37d3ceeb1f22f89ff8fb9690d83', + 'coreCommit': '9ebf886779b98fc3f78e11cf138246f80d5cab39', 'numberOfParts': 2 } } From 7a7a43361b997c16b236406d075dc57d2357a2c7 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 6 Aug 2020 13:12:18 +0545 Subject: [PATCH 2/3] Bump core commit to latest as of 2020-08-05 --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index d7abfa3b3..faa264a72 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ config = { 'apiTests': { 'coreBranch': 'master', - 'coreCommit': '9ebf886779b98fc3f78e11cf138246f80d5cab39', + 'coreCommit': 'a5a25faab347ae7006093ac3472d287e0ebd16f6', 'numberOfParts': 2 } } From a396dc11464e5a35789a4e2f19c8717a8ad722c9 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 6 Aug 2020 14:13:03 +0545 Subject: [PATCH 3/3] Move 'not preview-extension-required' filter to core API acceptance tests --- .drone.star | 4 +-- tests/acceptance/expected-failures.txt | 41 -------------------------- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/.drone.star b/.drone.star index faa264a72..245ec57f7 100644 --- a/.drone.star +++ b/.drone.star @@ -63,7 +63,7 @@ def localApiTestsOcStorage(ctx, coreBranch = 'master', coreCommit = ''): 'TEST_EXTERNAL_USER_BACKENDS':'true', 'REVA_LDAP_HOSTNAME':'ldap', 'TEST_OCIS':'true', - 'BEHAT_FILTER_TAGS': '~@skipOnOcis-OC-Storage&&~@preview-extension-required', + 'BEHAT_FILTER_TAGS': '~@skipOnOcis-OC-Storage', 'PATH_TO_CORE': '/srv/app/testrunner' }, 'commands': [ @@ -119,7 +119,7 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n 'TEST_EXTERNAL_USER_BACKENDS':'true', 'REVA_LDAP_HOSTNAME':'ldap', 'TEST_OCIS':'true', - 'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS', + 'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~@preview-extension-required', 'DIVIDE_INTO_NUM_PARTS': number_of_parts, 'RUN_PART': part_number, 'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures.txt' diff --git a/tests/acceptance/expected-failures.txt b/tests/acceptance/expected-failures.txt index c2dea4195..ecae9df22 100644 --- a/tests/acceptance/expected-failures.txt +++ b/tests/acceptance/expected-failures.txt @@ -637,47 +637,6 @@ apiWebdavOperations/search.feature:211 apiWebdavOperations/search.feature:213 apiWebdavOperations/search.feature:229 # -# https://github.com/owncloud/ocis/issues/187 Previews via webDAV API tests fails on OCIS -apiWebdavPreviews/previews.feature:15 -apiWebdavPreviews/previews.feature:16 -apiWebdavPreviews/previews.feature:17 -apiWebdavPreviews/previews.feature:18 -apiWebdavPreviews/previews.feature:19 -apiWebdavPreviews/previews.feature:30 -apiWebdavPreviews/previews.feature:31 -apiWebdavPreviews/previews.feature:32 -apiWebdavPreviews/previews.feature:33 -apiWebdavPreviews/previews.feature:34 -apiWebdavPreviews/previews.feature:35 -apiWebdavPreviews/previews.feature:36 -apiWebdavPreviews/previews.feature:63 -apiWebdavPreviews/previews.feature:64 -apiWebdavPreviews/previews.feature:65 -apiWebdavPreviews/previews.feature:66 -apiWebdavPreviews/previews.feature:67 -apiWebdavPreviews/previews.feature:68 -apiWebdavPreviews/previews.feature:69 -apiWebdavPreviews/previews.feature:88 -apiWebdavPreviews/previews.feature:103 -apiWebdavPreviews/previews.feature:104 -apiWebdavPreviews/previews.feature:105 -apiWebdavPreviews/previews.feature:127 -apiWebdavPreviews/previews.feature:128 -apiWebdavPreviews/previews.feature:143 -apiWebdavPreviews/previews.feature:160 -apiWebdavPreviews/previews.feature:169 -apiWebdavPreviews/previews.feature:186 -apiWebdavPreviews/previews.feature:201 -apiWebdavPreviews/previews.feature:208 -apiWebdavPreviews/previews.feature:224 -apiWebdavPreviews/previews.feature:242 -apiWebdavPreviews/previews.feature:271 -apiWebdavPreviews/previews.feature:272 -apiWebdavPreviews/previews.feature:273 -apiWebdavPreviews/previews.feature:274 -apiWebdavPreviews/previews.feature:286 -apiWebdavPreviews/previews.feature:287 -# # https://github.com/owncloud/ocis-reva/issues/11 listing received shares does not work apiWebdavProperties1/copyFile.feature:65 apiWebdavProperties1/copyFile.feature:66