merge phpunit into filesystem

2 files changed, 8 insertions, 17 deletions

diff --git a/tests/lib/cache/apc.php b/tests/lib/cache/apc.php
index 34ea968cd54..0e0edcf58f3 100644
--- a/tests/lib/cache/apc.php
+++ b/tests/lib/cache/apc.php
@@ -21,16 +21,11 @@
 */
 
 class Test_Cache_APC extends Test_Cache {
-	function skip() {
-		$this->skipUnless(function_exists('apc_store'));
-	}
-
 	public function setUp() {
+		if(!function_exists('apc_store')){
+			$this->markTestSkipped('The apc extension is not available.');
+			return;
+		}
 		$this->instance=new OC_Cache_APC();
 	}
-
-	function testTTL() {
-		// ttl doesn't work correctly in the same request
-		// see https://bugs.php.net/bug.php?id=58084
-	}
 }
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
-	}
 }