summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-08-16 10:32:04 +0200
committerLukas Reschke <lukas@owncloud.com>2014-08-16 10:32:04 +0200
commit283b99a42ddf6da72998ef4b01ee00af451cd884 (patch)
treef81787d60d615add4ee633f36930673df3d19854
parent549818633328b7320b766188982c07e8feb13708 (diff)
parent5a2fef43095d7a303041b6ffff7197c7af8e698d (diff)
downloadnextcloud-server-283b99a42ddf6da72998ef4b01ee00af451cd884.tar.gz
nextcloud-server-283b99a42ddf6da72998ef4b01ee00af451cd884.zip
Merge pull request #10276 from owncloud/skip-webdavput
skip WebdavTest of encryption
-rwxr-xr-xapps/files_encryption/tests/crypt.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 5eb9580e3b4..1bebb3cd36c 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -61,7 +61,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
function setUp() {
// set user id
- \OC_User::setUserId(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
+ \Test_Encryption_Util::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
$this->userId = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
$this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;