[Pkg-owncloud-commits] [owncloud] 36/70: check that the file proxies are enabled after each test

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v6.0.5RC1
in repository owncloud.

commit 6ef2acb82b78fe8a3c48c05324d8895f30db15e9
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Fri Jul 18 10:51:22 2014 +0200

    check that the file proxies are enabled after each test
---
 apps/files_encryption/tests/crypt.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 388980a..4bb8025 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -46,13 +46,12 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
 
-		// Filesystem related hooks
+		// clear hooks and register encryption hooks
+		\OC_Hook::clear();
 		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// Filesystem related hooks
 		\OCA\Encryption\Helper::registerUserHooks();
 
-		// clear and register hooks
+		// clear and register proxies
 		\OC_FileProxy::clearProxies();
 		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
@@ -95,6 +94,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		} else {
 			OC_App::disable('files_trashbin');
 		}
+
+		$this->assertTrue(\OC_FileProxy::$enabled);
 	}
 
 	public static function tearDownAfterClass() {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git