diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2014-07-16 16:55:17 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2014-07-16 16:55:17 +0200 |
| commit | 248e79c4657918ea76443909b277fc0f05676943 (patch) | |
| tree | 18ddf3d3c8cd52879e1208b3a6baae9fa85706fb | |
| parent | 7a43c623ae3273c2f43955091cb73f728f063cbb (diff) | |
| parent | b2c06354e8d13cc62be27bb029cafb552ce4d063 (diff) | |
| download | nextcloud-server-248e79c4657918ea76443909b277fc0f05676943.tar.gz nextcloud-server-248e79c4657918ea76443909b277fc0f05676943.zip | |
Merge pull request #9654 from owncloud/enctest-fileproxydisabledfix
Reenable proxies if a test failed to restore it
| -rw-r--r-- | tests/testcleanuplistener.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/testcleanuplistener.php b/tests/testcleanuplistener.php index 7065f0337b9..8a9e9e6efbf 100644 --- a/tests/testcleanuplistener.php +++ b/tests/testcleanuplistener.php @@ -166,6 +166,8 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener { private function cleanProxies() { $proxies = OC_FileProxy::getProxies(); OC_FileProxy::clearProxies(); + // reenable in case some test failed to reenable them + OC_FileProxy::$enabled = true; return count($proxies) > 0; } } |