From a67c737848389d32cd77512d06186db868eb5ac9 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 9 Dec 2013 01:02:42 +0100 Subject: [PATCH 1/2] Only run memcached tests if server is available. --- tests/lib/memcache/memcached.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/lib/memcache/memcached.php b/tests/lib/memcache/memcached.php index 4b38ae8ef3..67d3971789 100644 --- a/tests/lib/memcache/memcached.php +++ b/tests/lib/memcache/memcached.php @@ -10,6 +10,13 @@ namespace Test\Memcache; class Memcached extends Cache { + static public function setUpBeforeClass() { + $instance = new \OC\Memcache\Memcached(uniqid()); + if ($instance->set(uniqid(), uniqid()) === false) { + self::markTestSkipped('memcached server seems to be down.'); + } + } + public function setUp() { if (!\OC\Memcache\Memcached::isAvailable()) { $this->markTestSkipped('The memcached extension is not available.'); From 67310b60f738eebd7d4f121cd4ff1e838da2f51a Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 9 Dec 2013 14:31:35 +0100 Subject: [PATCH 2/2] Ensure memcached extension is there before attempting to create an instance. --- tests/lib/memcache/memcached.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/lib/memcache/memcached.php b/tests/lib/memcache/memcached.php index 67d3971789..fdab32693f 100644 --- a/tests/lib/memcache/memcached.php +++ b/tests/lib/memcache/memcached.php @@ -11,6 +11,9 @@ namespace Test\Memcache; class Memcached extends Cache { static public function setUpBeforeClass() { + if (!\OC\Memcache\Memcached::isAvailable()) { + self::markTestSkipped('The memcached extension is not available.'); + } $instance = new \OC\Memcache\Memcached(uniqid()); if ($instance->set(uniqid(), uniqid()) === false) { self::markTestSkipped('memcached server seems to be down.'); @@ -18,10 +21,6 @@ class Memcached extends Cache { } public function setUp() { - if (!\OC\Memcache\Memcached::isAvailable()) { - $this->markTestSkipped('The memcached extension is not available.'); - return; - } $this->instance = new \OC\Memcache\Memcached(uniqid()); } }