fix filesystem and encryption tests

Conflicts:
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/hooks.php

diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 98e96e0cc78a16b622244862119025e4a017da05..a01b15eb2df7cf8842dbecbc46735d266094224a 100644 (file)
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -22,6 +22,8 @@
 
 namespace Test\Files;
 
+use OC\User\NoUserException;
+
 class Filesystem extends \Test\TestCase {
        /**
         * @var array tmpDirs
@@ -259,19 +261,14 @@ class Filesystem extends \Test\TestCase {
        }
 
        /**
-        * Tests that a local storage mount is used when passed user
-        * does not exist.
+        * Tests that an exception is thrown when passed user does not exist.
+        * @expectedException \OC\User\NoUserException
         */
        public function testLocalMountWhenUserDoesNotExist() {
                $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
                $userId = $this->getUniqueID('user_');
 
                \OC\Files\Filesystem::initMountPoints($userId);
-
-               $homeMount = \OC\Files\Filesystem::getStorage('/' . $userId . '/');
-
-               $this->assertTrue($homeMount->instanceOfStorage('\OC\Files\Storage\Local'));
-               $this->assertEquals('local::' . $datadir . '/' . $userId . '/', $homeMount->getId());
        }
 
        /**