diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-02-15 21:04:48 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-02-15 21:04:48 +0100 |
| commit | 2ed850e05b46d820528813c2f2415dad60c1c570 (patch) | |
| tree | a46c29c4fd7c01f71261499c7a33996a23830fc5 /tests/lib/files/cache | |
| parent | 9738fae3cf1ad18593d21eb62e138e00c01f5f36 (diff) | |
| parent | 425d41aaf93e1cd3a44ddc794414683e8e2c4648 (diff) | |
| download | nextcloud-server-2ed850e05b46d820528813c2f2415dad60c1c570.tar.gz nextcloud-server-2ed850e05b46d820528813c2f2415dad60c1c570.zip | |
merge master into filecache_mtime
Diffstat (limited to 'tests/lib/files/cache')
| -rw-r--r-- | tests/lib/files/cache/updater.php | 2 | ||||
| -rw-r--r-- | tests/lib/files/cache/watcher.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php index b83dd0c26e5..7a79f45a203 100644 --- a/tests/lib/files/cache/updater.php +++ b/tests/lib/files/cache/updater.php @@ -45,7 +45,7 @@ class Updater extends \PHPUnit_Framework_TestCase { if (!self::$user) { if (!\OC\Files\Filesystem::getView()) { self::$user = uniqid(); - \OC\Files\Filesystem::init('/' . self::$user . '/files'); + \OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files'); } else { self::$user = \OC_User::getUser(); } diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php index 1ea0c2eb47a..e43c86ed438 100644 --- a/tests/lib/files/cache/watcher.php +++ b/tests/lib/files/cache/watcher.php @@ -76,7 +76,6 @@ class Watcher extends \PHPUnit_Framework_TestCase { $updater->checkUpdate(''); $entry = $cache->get('foo.txt'); - $this->assertEquals(-1, $entry['size']); $this->assertEquals('httpd/unix-directory', $entry['mimetype']); $this->assertFalse($cache->inCache('folder')); $this->assertFalse($cache->inCache('folder/bar.txt')); |