aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2018-04-03 18:24:27 +0200
committerGitHub <noreply@github.com>2018-04-03 18:24:27 +0200
commitc3900c9d0dc011f8637815d4f9a67d82117437cd (patch)
tree4bbbafbf253ccdfbfac1193c5ede44ebf5da4ed5 /tests
parent75cf631fd6a6124f98c32d4dd7de4749a4f04378 (diff)
parenta0923d9ffb3f6827fefdef91e14992fd7d452ede (diff)
downloadnextcloud-server-c3900c9d0dc011f8637815d4f9a67d82117437cd.tar.gz
nextcloud-server-c3900c9d0dc011f8637815d4f9a67d82117437cd.zip
Merge pull request #9018 from nextcloud/fix-copy-encrypted-files
reset encryptionVersion to '1' if a file was stream copied
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/Files/Storage/Wrapper/EncryptionTest.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php
index 5bcff56e373..082c08b3e43 100644
--- a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php
+++ b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php
@@ -802,7 +802,7 @@ class EncryptionTest extends Storage {
'encrypted' => $expectedEncrypted,
];
if($expectedEncrypted === true) {
- $expectedCachePut['encryptedVersion'] = 12345;
+ $expectedCachePut['encryptedVersion'] = 1;
}
$this->arrayCache->expects($this->never())->method('set');