merge phpunit into filesystem

1 files changed, 4 insertions, 8 deletions

diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php
index 85cc2d8b3c6..c081036a31f 100644
--- a/tests/lib/cache/xcache.php
+++ b/tests/lib/cache/xcache.php
@@ -21,15 +21,11 @@
 */
 
 class Test_Cache_XCache extends Test_Cache {
-	function skip() {
-		$this->skipUnless(function_exists('xcache_get'));
-	}
-
 	public function setUp() {
+		if(!function_exists('xcache_get')){
+			$this->markTestSkipped('The xcache extension is not available.');
+			return;
+		}
 		$this->instance=new OC_Cache_XCache();
 	}
-
-	function testTTL() {
-		// ttl doesn't work correctly in the same request
-	}
 }