Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable e2e tests #1299

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Re-enable e2e tests #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -213,6 +213,6 @@ trigger:
- pull_request
---
kind: signature
hmac: 56749c47df149cc2d3c06343c609210a310e27635ea6ccb040890ab0afbce79d
hmac: 6d69c7c3739747691580d04a781eb67cf95d2f33f8149d5ebd2cbcc30611b4f0

...
6 changes: 4 additions & 2 deletions ...oidTest/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -111,7 +113,7 @@ public void uploadAndModifyV1() {
assertEquals(updatedMetadata, retrievedMetadata2);
}

//@Test
@Test
public void uploadAndModifyV2() {
// tests only for NC19+
testOnlyOnServer(OwnCloudVersion.nextcloud_20);
Expand Down
Loading