diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-30 22:45:58 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:28 +0200 |
| commit | 1b42b492dce562596b8b57a11546728f697c4f38 (patch) | |
| tree | 6280aa40baaf55db44edf84a906b83db2d47fc46 /tests | |
| parent | dbdd754c3fc37dc3100a9741f956d913e6d64576 (diff) | |
| download | nextcloud-server-1b42b492dce562596b8b57a11546728f697c4f38.tar.gz nextcloud-server-1b42b492dce562596b8b57a11546728f697c4f38.zip | |
kill OC_FileProxy :boom:
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bootstrap.php | 1 | ||||
| -rw-r--r-- | tests/lib/cache/file.php | 1 | ||||
| -rw-r--r-- | tests/lib/cache/usercache.php | 1 | ||||
| -rw-r--r-- | tests/lib/testcase.php | 11 |
4 files changed, 0 insertions, 14 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php index cebd899e785..5945dbdc11f 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -25,4 +25,3 @@ if (!class_exists('PHPUnit_Framework_TestCase')) { OC_Hook::clear(); OC_Log::$enabled = false; -OC_FileProxy::clearProxies(); diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 1bf7491081d..153cb198f13 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -38,7 +38,6 @@ class FileCache extends \Test_Cache { parent::setUp(); //clear all proxies and hooks so we can do clean testing - \OC_FileProxy::clearProxies(); \OC_Hook::clear('OC_Filesystem'); //set up temporary storage diff --git a/tests/lib/cache/usercache.php b/tests/lib/cache/usercache.php index 63667a3d34e..26a9158ab3a 100644 --- a/tests/lib/cache/usercache.php +++ b/tests/lib/cache/usercache.php @@ -34,7 +34,6 @@ class UserCache extends \Test_Cache { parent::setUp(); //clear all proxies and hooks so we can do clean testing - \OC_FileProxy::clearProxies(); \OC_Hook::clear('OC_Filesystem'); //set up temporary storage diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php index d532a3b01c0..a83be713194 100644 --- a/tests/lib/testcase.php +++ b/tests/lib/testcase.php @@ -71,7 +71,6 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { self::tearDownAfterClassCleanFileCache(); self::tearDownAfterClassCleanStrayDataFiles($dataDir); self::tearDownAfterClassCleanStrayHooks(); - self::tearDownAfterClassCleanProxies(); parent::tearDownAfterClass(); } @@ -165,16 +164,6 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { } /** - * Clean up the list of file proxies - * - * Also reenables file proxies, in case a test disabled them - */ - static protected function tearDownAfterClassCleanProxies() { - \OC_FileProxy::$enabled = true; - \OC_FileProxy::clearProxies(); - } - - /** * Login and setup FS as a given user, * sets the given user as the current user. * |