Restoring the error handler within the error handler causes unexpected results

See http://php.net/manual/en/function.restore-error-handler.php#120879
for more information.

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/tests/lib/Memcache/RedisTest.php b/tests/lib/Memcache/RedisTest.php
index 094954d4a1a..e707f30fb5b 100644
--- a/tests/lib/Memcache/RedisTest.php
+++ b/tests/lib/Memcache/RedisTest.php
@@ -17,15 +17,22 @@ class RedisTest extends Cache {
 			self::markTestSkipped('The redis extension is not available.');
 		}
 
+		$errorOccurred = false;
 		set_error_handler(
 			function($errno, $errstr) {
-				restore_error_handler();
-				self::markTestSkipped($errstr);
+				throw new \RuntimeException($errstr, 123456789);
 			},
 			E_WARNING
 		);
-		$instance = new \OC\Memcache\Redis(self::getUniqueID());
+		try {
+			$instance = new \OC\Memcache\Redis(self::getUniqueID());
+		} catch (\RuntimeException $e) {
+			$errorOccurred = $e->getCode() === 123456789 ? $e->getMessage() : false;
+		}
 		restore_error_handler();
+		if ($errorOccurred !== false) {
+			self::markTestSkipped($errorOccurred);
+		}
 
 		if ($instance->set(self::getUniqueID(), self::getUniqueID()) === false) {
 			self::markTestSkipped('redis server seems to be down.');