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.

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

[15] Add interface to allow storages from opting out of encryption #12692

Merged
merged 3 commits into from Nov 29, 2018

Conversation

@icewind1991
Copy link
Member

@icewind1991 icewind1991 commented Nov 27, 2018

Backport of #12691

As opposed to hard-coding a list of excluded storages

Signed-off-by: Robin Appelman <robin@icewind.nl>
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Nice 👍

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented Nov 29, 2018

https://drone.nextcloud.com/nextcloud/server/13084/116

1) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #2 (false, array('OCA\Files_Sharing\SharedStorage'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

2) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #3 (false, array('OCA\Files_Sharing\External\Storage'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

3) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #4 (false, array('OC\Files\Storage\OwnCloud'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

4) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #5 (false, array('OCA\Files_Sharing\SharedStorage', 'OCA\Files_Sharing\External\Storage'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

5) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #6 (false, array('OCA\Files_Sharing\SharedStorage', 'OC\Files\Storage\OwnCloud'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

6) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #7 (false, array('OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84

7) Test\Encryption\EncryptionWrapperTest::testWrapStorage with data set #8 (false, array('OCA\Files_Sharing\SharedStorage', 'OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud'))
Asserted that the storage is (not) wrapped with encryption
Failed asserting that true matches expected false.

/drone/src/github.com/nextcloud/server/tests/lib/Encryption/EncryptionWrapperTest.php:84
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Copy link
Member Author

@icewind1991 icewind1991 commented Nov 29, 2018

tests are happy again

@ChristophWurst ChristophWurst requested a review from MorrisJobke Nov 29, 2018
Copy link
Member

@MorrisJobke MorrisJobke left a comment

👍

@MorrisJobke MorrisJobke merged commit 96450a9 into stable15 Nov 29, 2018
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/drone/pr the build failed
Details
@dco
DCO DCO
Details
@fixupbot
fixupbot No fixup commits found. The commit history is clean
Details
@MorrisJobke MorrisJobke deleted the storage-no-encryption-interface-15 branch Nov 29, 2018
@MorrisJobke MorrisJobke mentioned this pull request Nov 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants