From 0f39893782dbc08fe664b259d3f536f4f1264944 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 16 Jan 2024 07:05:33 +0100 Subject: [PATCH] Re-enable e2e tests Signed-off-by: tobiasKaminsky --- .drone.yml | 4 ++-- .../lib/resources/e2ee/UpdateMetadataRemoteOperationIT.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5c97b452b2..e4165d097d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -79,7 +79,7 @@ services: - su www-data -c "php /var/www/html/occ app:enable activity" - su www-data -c "git clone -b main https://github.com/nextcloud/text.git /var/www/html/apps/text/" - su www-data -c "php /var/www/html/occ app:enable text" - - su www-data -c "git clone -b artonge/feat/allow_metadata_update_for_subfolders https://github.com/nextcloud/end_to_end_encryption/ /var/www/html/apps/end_to_end_encryption/" + - su www-data -c "git clone -b master https://github.com/nextcloud/end_to_end_encryption/ /var/www/html/apps/end_to_end_encryption/" - su www-data -c "php /var/www/html/occ app:enable end_to_end_encryption" - su www-data -c "git clone -b master https://github.com/nextcloud/password_policy/ /var/www/html/apps/password_policy/" - su www-data -c "php /var/www/html/occ app:enable password_policy" @@ -213,6 +213,6 @@ trigger: - pull_request --- kind: signature -hmac: 56749c47df149cc2d3c06343c609210a310e27635ea6ccb040890ab0afbce79d +hmac: 6d69c7c3739747691580d04a781eb67cf95d2f33f8149d5ebd2cbcc30611b4f0 ... diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperationIT.java index 1014f6d562..259693520c 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperationIT.java +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperationIT.java @@ -42,8 +42,10 @@ import com.owncloud.android.lib.resources.files.model.RemoteFile; import com.owncloud.android.lib.resources.status.OwnCloudVersion; +import org.junit.Test; + public class UpdateMetadataRemoteOperationIT extends AbstractIT { - //@Test + @Test public void uploadAndModifyV1() { // tests only for NC19+ testOnlyOnServer(OwnCloudVersion.nextcloud_20); @@ -111,7 +113,7 @@ public void uploadAndModifyV1() { assertEquals(updatedMetadata, retrievedMetadata2); } - //@Test + @Test public void uploadAndModifyV2() { // tests only for NC19+ testOnlyOnServer(OwnCloudVersion.nextcloud_20);