Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 14:41:04 +0000 (15:41 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 14:41:04 +0000 (15:41 +0100)
cache/stores/memcache/tests/memcache_test.php
cache/stores/memcached/tests/memcached_test.php

index bf9dad3..63d366c 100644 (file)
@@ -141,6 +141,10 @@ class cachestore_memcache_test extends cachestore_tests {
     public function test_clustered() {
         $this->resetAfterTest(true);
 
+        if (!defined('TEST_CACHESTORE_MEMCACHE_TESTSERVERS')) {
+            $this->markTestSkipped();
+        }
+
         $testservers = explode("\n", trim(TEST_CACHESTORE_MEMCACHE_TESTSERVERS));
 
         if (count($testservers) < 2) {
index 756744a..506e583 100644 (file)
@@ -141,6 +141,10 @@ class cachestore_memcached_test extends cachestore_tests {
     public function test_clustered() {
         $this->resetAfterTest(true);
 
+        if (!defined('TEST_CACHESTORE_MEMCACHED_TESTSERVERS')) {
+            $this->markTestSkipped();
+        }
+
         $testservers = explode("\n", trim(TEST_CACHESTORE_MEMCACHED_TESTSERVERS));
 
         if (count($testservers) < 2) {