aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-10-30 09:07:07 -0700
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-10-30 09:07:07 -0700
commit7ba803919bc314ee84b4e5adc9d7a6bf53af8233 (patch)
treec47f38b7f55d017228337d3b2a5ed1c30229d698 /tests
parentfdaac995267528af866ce13f32e7b74e911bcdfe (diff)
parentb65b7965ae18cbad09b8feda512f85354dd77bf0 (diff)
downloadnextcloud-server-7ba803919bc314ee84b4e5adc9d7a6bf53af8233.tar.gz
nextcloud-server-7ba803919bc314ee84b4e5adc9d7a6bf53af8233.zip
Merge pull request #5625 from owncloud/fix-test-master
fix failing preview test on master
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/preview.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index d0cdd2c44fb..353b66fd6d6 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -134,13 +134,11 @@ class Preview extends \PHPUnit_Framework_TestCase {
}
private function initFS() {
- if(\OC\Files\Filesystem::getView()){
- $user = \OC_User::getUser();
- }else{
- $user=uniqid();
- \OC_User::setUserId($user);
- \OC\Files\Filesystem::init($user, '/'.$user.'/files');
- }
+ // create a new user with his own filesystem view
+ // this gets called by each test in this test class
+ $user=uniqid();
+ \OC_User::setUserId($user);
+ \OC\Files\Filesystem::init($user, '/'.$user.'/files');
\OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', array(), '/');