Merge branch 'master' into update-readme

ackintosh · Jul 29, 2019 · e5134e6 · e5134e6
2 parents cf3a000 + 5b9e99b
commit e5134e6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,7 @@ services:
   - mongodb
 
 before_install:
+  - ./install_memcached.sh
   - phpenv config-add .travis.php.ini
 
 before_script:

diff --git a/install_memcached.sh b/install_memcached.sh
@@ -0,0 +1,4 @@
+# Workaround for PHP5.6
+if [ "$(php -v | cut -d ' ' -f 2 | head -n 1)" == '5.6.40' ]; then
+	printf "\n" | pecl install memcached-2.2.0
+fi
diff --git a/tests/Ackintosh/Ganesha/Storage/Adapter/MemcachedTest.php b/tests/Ackintosh/Ganesha/Storage/Adapter/MemcachedTest.php
@@ -236,6 +236,7 @@ public function loadStatusThrowsException()
 
     /**
      * @test
+     * @requires PHP 7.0
      */
     public function resetWillDoNothingIfNoDataExists()
     {
@@ -260,6 +261,7 @@ public function resetWillDoNothingIfNoDataExists()
 
     /**
      * @test
+     * @requires PHP 7.0
      * @expectedException \RuntimeException
      * @expectedExceptionMessage Couldn't connect to memcached.
      */
@@ -278,6 +280,7 @@ public function resetThrowsExceptionWhenFailedToGetStats()
 
     /**
      * @test
+     * @requires PHP 7.0
      * @expectedException \RuntimeException
      * @expectedExceptionMessageRegExp /\Afailed to get memcached keys/
      */

diff --git a/tests/Ackintosh/GaneshaTest.php b/tests/Ackintosh/GaneshaTest.php
@@ -158,6 +158,7 @@ public function disable()
 
     /**
      * @test
+     * @requires PHP 7.0
      */
     public function reset()
     {