From 8d448a52294b9b0d36da54d381535b1458bd738c Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 27 Aug 2020 09:30:45 +0200 Subject: [PATCH 1/4] Update ocis-reva to 0.13.0 --- changelog/unreleased/update-ocis-reva-2020-08-27.md | 5 +++++ go.mod | 2 +- go.sum | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/update-ocis-reva-2020-08-27.md diff --git a/changelog/unreleased/update-ocis-reva-2020-08-27.md b/changelog/unreleased/update-ocis-reva-2020-08-27.md new file mode 100644 index 00000000000..76067321f0b --- /dev/null +++ b/changelog/unreleased/update-ocis-reva-2020-08-27.md @@ -0,0 +1,5 @@ +Change: Update ocis-reva to 0.13.0 + +This version delivers ocis-reva v0.13.0 + +https://github.com/owncloud/ocis/pull/496 diff --git a/go.mod b/go.mod index 3201086e09a..b591447099c 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/owncloud/ocis-phoenix v0.12.0 github.com/owncloud/ocis-pkg/v2 v2.3.0 github.com/owncloud/ocis-proxy v0.7.0 - github.com/owncloud/ocis-reva v0.12.1-0.20200819133706-f68defd1ff27 + github.com/owncloud/ocis-reva v0.13.0 github.com/owncloud/ocis-settings v0.2.0 github.com/owncloud/ocis-store v0.1.1 github.com/owncloud/ocis-thumbnails v0.3.0 diff --git a/go.sum b/go.sum index 20319849897..3a577de2701 100644 --- a/go.sum +++ b/go.sum @@ -314,11 +314,13 @@ github.com/cs3org/go-cs3apis v0.0.0-20200408065125-6e23f3ecec0a/go.mod h1:UXha4T github.com/cs3org/go-cs3apis v0.0.0-20200611124600-7a1be2026543/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200730121022-c4f3d4f7ddfd h1:uMaudkC7znaiIKT9rxIhoRYzrhTg1Nc78X7XEqhmjSk= github.com/cs3org/go-cs3apis v0.0.0-20200730121022-c4f3d4f7ddfd/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/go-cs3apis v0.0.0-20200810113633-b00aca449666/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A= github.com/cs3org/reva v0.1.0/go.mod h1:8j6QyyAq9Kjj7RPfJb7M1aEmw5DmsuCJKUULXxYOyRo= github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= github.com/cs3org/reva v1.1.1-0.20200819100654-dcbf0c8ea187 h1:ZyDXH+zy5KPOH5AM5CMHP2j9dhV6bM3JQmqTfO8fxJ8= github.com/cs3org/reva v1.1.1-0.20200819100654-dcbf0c8ea187/go.mod h1:gkGtoun9QABW8k7jzAWWxB9jO64DJ1lreSzTucci/ok= +github.com/cs3org/reva v1.2.1-0.20200826162318-c0f54e1f37ea/go.mod h1:FvYB+UPpuPCw0hH42qHVR1R2atZyy69METZI/zEaST8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= @@ -1289,6 +1291,8 @@ github.com/owncloud/ocis-proxy v0.7.0 h1:ruOOz0Ed4crtkjqFRvvbgywUfDldcWDxOqbUQlw github.com/owncloud/ocis-proxy v0.7.0/go.mod h1:zyAWyZXjILb3Lsotxc2a+Iwkj4jKXtT4O0ajB5b3jnY= github.com/owncloud/ocis-reva v0.12.1-0.20200819133706-f68defd1ff27 h1:LupXoJXY0cK33+8s6bBA3M8g4J2kv6YHBY7szyPIsHI= github.com/owncloud/ocis-reva v0.12.1-0.20200819133706-f68defd1ff27/go.mod h1:mZpI9axqlcOy8rk19JicZFGUIVB8VxD/0VLiIJxi6GE= +github.com/owncloud/ocis-reva v0.13.0 h1:np4Xk/hBWSOIsahimP6tnwiEl1YKj8okJ7M5IAaNfBY= +github.com/owncloud/ocis-reva v0.13.0/go.mod h1:cTcLFOO/tg4/GyYygi/VVXFjZAQWE3YxlyfhZ/vcAj4= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= @@ -1537,6 +1541,7 @@ github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgh github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/studio-b12/gowebdav v0.0.0-20200303150724-9380631c29a1/go.mod h1:gCcfDlA1Y7GqOaeEKw5l9dOGx1VLdc/HuQSlQAaZ30s= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= github.com/subosito/gotenv v1.1.1/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= From 0a8f935e4bf22d78fdf5967923731df0ffaf6a25 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 27 Aug 2020 13:37:54 +0545 Subject: [PATCH 2/4] Adjust local trashbin scenarios now that new DAV path works --- .../apiTrashbin-trashbinFilesFolders.feature | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinFilesFolders.feature b/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinFilesFolders.feature index 3da3f6e6f10..ff8fc05e622 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinFilesFolders.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinFilesFolders.feature @@ -16,8 +16,7 @@ Feature: files and folders exist in the trashbin after being deleted And using new DAV path When user "Alice" deletes file "/textfile1.txt" using the WebDAV API Then as "Alice" the file with original path "/textfile0.txt" should exist in the trashbin - But as "Alice" the file with original path "/textfile1.txt" should not exist in the trashbin - And as "Alice" the file with original path "Alice/textfile1.txt" should exist in the trashbin + And as "Alice" the file with original path "/textfile1.txt" should exist in the trashbin And as "Alice" file "/textfile0.txt" should not exist And as "Alice" file "/textfile1.txt" should not exist @@ -32,7 +31,6 @@ Feature: files and folders exist in the trashbin after being deleted And using new DAV path When user "Alice" deletes folder "/tmp2" using the WebDAV API Then as "Alice" the folder with original path "/tmp1" should exist in the trashbin - But as "Alice" the folder with original path "/tmp2" should not exist in the trashbin - And as "Alice" the folder with original path "Alice/tmp2" should exist in the trashbin + And as "Alice" the folder with original path "/tmp2" should exist in the trashbin And as "Alice" folder "/tmp1" should not exist And as "Alice" folder "/tmp2" should not exist From e1cc04c604e44cb6cdf30f7286115ea87b15fa33 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 27 Aug 2020 13:39:30 +0545 Subject: [PATCH 3/4] Also use new dav-path for empty-trashbin local scenarios --- .../apiOcisSpecific/apiTrashbin-trashbinDelete.feature | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature b/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature index 697c8787c11..c63c4f5f696 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature @@ -22,7 +22,7 @@ Feature: files and folders can be deleted from the trashbin # because of @issue-product-178 we cannot perform this test using new dav, so only old dav is being used Given user "Alice" has uploaded file with content "file with comma" to "sample,0.txt" And user "Alice" has uploaded file with content "file with comma" to "sample,1.txt" - And using old DAV path + And using DAV path And user "Alice" has deleted file "" And user "Alice" has deleted file "" And as "Alice" file "" should exist in the trashbin @@ -31,9 +31,11 @@ Feature: files and folders can be deleted from the trashbin Then as "Alice" the file with original path "" should exist in the trashbin And as "Alice" the file with original path "" should exist in the trashbin Examples: - | filename1 | filename2 | - | textfile0.txt | textfile1.txt | - | sample,0.txt | sample,1.txt | + | dav-path | filename1 | filename2 | + | old | textfile0.txt | textfile1.txt | + | old | sample,0.txt | sample,1.txt | + | new | textfile0.txt | textfile1.txt | + | new | sample,0.txt | sample,1.txt | @smokeTest @issue-ocis-reva-118 From 95e2b9f563fa83887a5b661651e5a416174f54b7 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 27 Aug 2020 13:42:01 +0545 Subject: [PATCH 4/4] Remove passing trashbin scenarios from expected-failures --- tests/acceptance/expected-failures-on-OC-storage.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/acceptance/expected-failures-on-OC-storage.txt b/tests/acceptance/expected-failures-on-OC-storage.txt index 94b58ff6175..69df0a0ac76 100644 --- a/tests/acceptance/expected-failures-on-OC-storage.txt +++ b/tests/acceptance/expected-failures-on-OC-storage.txt @@ -480,20 +480,16 @@ apiTrashbin/trashbinDelete.feature:67 # # https://github.com/owncloud/product/issues/179 Propfind to trashbin endpoint requires UUID # https://github.com/owncloud/product/issues/178 File deletion using dav gives unique string in filename in the trashbin -apiTrashbin/trashbinFilesFolders.feature:21 -apiTrashbin/trashbinFilesFolders.feature:32 apiTrashbin/trashbinFilesFolders.feature:44 apiTrashbin/trashbinFilesFolders.feature:45 apiTrashbin/trashbinFilesFolders.feature:60 apiTrashbin/trashbinFilesFolders.feature:61 -apiTrashbin/trashbinFilesFolders.feature:75 apiTrashbin/trashbinFilesFolders.feature:89 apiTrashbin/trashbinFilesFolders.feature:90 apiTrashbin/trashbinFilesFolders.feature:104 apiTrashbin/trashbinFilesFolders.feature:105 apiTrashbin/trashbinFilesFolders.feature:136 apiTrashbin/trashbinFilesFolders.feature:137 -apiTrashbin/trashbinFilesFolders.feature:155 apiTrashbin/trashbinFilesFolders.feature:185 apiTrashbin/trashbinFilesFolders.feature:186 apiTrashbin/trashbinFilesFolders.feature:203 @@ -507,13 +503,9 @@ apiTrashbin/trashbinFilesFolders.feature:256 apiTrashbin/trashbinFilesFolders.feature:270 apiTrashbin/trashbinFilesFolders.feature:271 apiTrashbin/trashbinFilesFolders.feature:272 -apiTrashbin/trashbinFilesFolders.feature:273 -apiTrashbin/trashbinFilesFolders.feature:274 -apiTrashbin/trashbinFilesFolders.feature:275 apiTrashbin/trashbinFilesFolders.feature:276 apiTrashbin/trashbinFilesFolders.feature:277 apiTrashbin/trashbinFilesFolders.feature:278 -apiTrashbin/trashbinFilesFolders.feature:289 # # https://github.com/owncloud/product/issues/179 Propfind to trashbin endpoint requires UUID # https://github.com/owncloud/product/issues/178 File deletion using dav gives unique string in filename in the trashbin @@ -543,8 +535,6 @@ apiTrashbin/trashbinRestore.feature:206 apiTrashbin/trashbinRestore.feature:207 apiTrashbin/trashbinRestore.feature:279 apiTrashbin/trashbinRestore.feature:280 -apiTrashbin/trashbinRestore.feature:295 -apiTrashbin/trashbinRestore.feature:310 apiTrashbin/trashbinRestore.feature:323 apiTrashbin/trashbinRestore.feature:324 apiTrashbin/trashbinRestore.feature:325