Merge pull request #826 from Geolim4/master

Migrate all tests on bionic

Author: Geolim4

.travis.yml

@@ -11,11 +11,12 @@
 os: linux
 dist: bionic
 language: php
+
 services:
   - memcached
   - redis
-  - couchdb
   - mongodb
+  - docker
 
 php:
   - 7.3
@@ -26,38 +27,28 @@ jobs:
   fast_finish: true
   allow_failures:
     - php: nightly
-  include:
-    - dist: trusty
-      php: 7.3
-    - dist: trusty
-      php: 7.4
-  exclude:
-    - dist: bionic
-      php: 7.3
-    - dist: bionic
-      php: 7.4
 
 before_install:
 # Memcached is not yet available for PHP8 (hasn't been updated since 2019): https://pecl.php.net/package/memcached
 # Memcache however seems to be compatible with PHP 7 and 8: https://pecl.php.net/package/memcache
 #
   - |
-    echo "\$TRAVIS_PHP_VERSION set to: $TRAVIS_PHP_VERSION";
+    ./bin/ci/scripts/setup_couchdb.sh;
+    ./bin/ci/scripts/setup_mongodb.sh
+    ./bin/ci/scripts/setup_couchbase.sh;
     pecl channel-update pecl.php.net;
     yes | pecl install -f mongodb-stable;
     yes | pecl install -f apcu-stable || true;
+    yes | pecl install -f memcache;
+    yes | pecl install -f couchbase-stable;
   - |
     if [[ $TRAVIS_PHP_VERSION == "8."* || $TRAVIS_PHP_VERSION == "nightly" ]]; then
-        ./bin/ci/scripts/setup_couchbase.sh;
-        yes | pecl install -f couchbase-stable;
-        yes | pecl install -f memcache;
         phpenv config-add bin/ci/php8_phpfastcache.ini;
     else
         phpenv config-add bin/ci/php7_phpfastcache.ini;
     fi
   - phpenv config-add bin/ci/php_common.ini;
   - phpenv config-rm xdebug.ini
-  - ./bin/ci/scripts/setup_mongodb.sh
 
 install:
   - ./bin/ci/scripts/install_dependencies.sh

bin/ci/php7_phpfastcache.ini

@@ -1 +1 @@
-extension="memcached.so"
+

bin/ci/run_tests.php

@@ -14,9 +14,11 @@
 $phpBinPath = 'php ';
 $status = 0;
 $dir = __DIR__;
+$projectDir = dirname($dir, 2);
 $driver = $argv[ 1 ] ?? 'Files';
 $phpBinPath = $_SERVER['PHP_BIN_PATH'] ?? 'php';
 $failedTests = [];
+$skippedTests = [];
 
 /**
  * @param string $pattern
@@ -38,18 +40,23 @@
 foreach ($globCallback(PFC_TEST_DIR . DIRECTORY_SEPARATOR . '*.test.php') as $filename) {
     $climate->backgroundLightYellow()->blue()->out('---');
     $command = "{$phpBinPath} -f {$filename} {$driver}";
-    $climate->out("<yellow>phpfastcache@unit-tests</yellow> <blue>{$dir}</blue> <green>#</green> <red>$command</red>");
+    $shortCommand = str_replace(dirname(PFC_TEST_DIR), '~', $command);
+
+    $climate->out("<yellow>phpfastcache@unit-tests</yellow> <blue>{$projectDir}</blue> <green>#</green> <red>$shortCommand</red>");
 
     \exec($command, $output, $return_var);
     $climate->out('=====================================');
     $climate->out(\implode("\n", $output));
     $climate->out('=====================================');
     if ($return_var === 0) {
-        $climate->green("Process finished with exit code $return_var");
-    } else {
-        $climate->red("Process finished with exit code $return_var");
-        $status = 255;
+        $climate->green("Test finished successfully");
+    } else if($return_var === 1){
+        $climate->red("Test finished with a least one error");
+        $status = 1;
         $failedTests[] = basename($filename);
+    }else{
+        $climate->yellow("Test skipped due to unmeet dependencies");
+        $skippedTests[] = basename($filename);
     }
 
     $climate->out('');
@@ -62,11 +69,15 @@
 $execTime = gmdate('i\m s\s', (int) round(microtime(true) - $timestamp, 3));
 $climate->out('<yellow>Total tests duration: </yellow><light_green>' . $execTime . '</light_green>');
 
-if ($status === 0) {
+if (!$failedTests) {
     $climate->backgroundGreen()->white()->flank('[OK] The build has passed successfully', '#')->out('');
 } else {
     $climate->backgroundRed()->white()->flank('[KO] The build has failed miserably', '~')->out('');
-    $climate->red()->out('Tests failed: ' . implode(', ', $failedTests))->out('');
+    $climate->red()->out('[TESTS FAILED] ' . PHP_EOL . '- '. implode(PHP_EOL . '- ', $failedTests))->out('');
+}
+
+if($skippedTests){
+    $climate->yellow()->out('[TESTS SKIPPED] ' . PHP_EOL . '- '. implode(PHP_EOL . '- ', $skippedTests))->out('');
 }
 
 exit($status);

bin/ci/scripts/setup_couchbase.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Not possible to run docker container in travis...
-# https://docs.travis-ci.com/user/database-setup/#starting-services => Couchbase not yet available
-
 set -e
 
 export CB_VERSION=7.0.0
@@ -30,8 +27,8 @@ check_db() {
 i=1
 # Echo with
 numbered_echo() {
-  echo "[$i] $@"
-  i=`expr $i + 1`
+  echo "[$i] $*"
+  i=$(($i+1))
 }
 
 echo "# Prepare Couchbase dependencies"
@@ -54,24 +51,23 @@ done
 
 echo "# Couchbase Server Online"
 echo "# Starting setup process"
-
-echo "# Setting up memory"
+echo "# 1) Setting up memory"
 curl -i "http://127.0.0.1:8091/pools/default" \
     -d memoryQuota=${MEMORY_QUOTA} \
     -d indexMemoryQuota=${INDEX_MEMORY_QUOTA} \
     -d ftsMemoryQuota=${FTS_MEMORY_QUOTA}
 
-echo "# Setting up services"
+echo "# 2) Setting up services"
 curl -i "http://127.0.0.1:8091/node/controller/setupServices" \
     -d services="${SERVICES}"
 
-echo "# Setting up user credentials"
+echo "# 3) Setting up user credentials"
 curl -i "http://127.0.0.1:8091/settings/web" \
     -d port=8091 \
     -d username=${USERNAME} \
     -d password=${PASSWORD}
 
-echo "# Setting up the bucket"
+echo "# 4) Setting up the bucket"
 curl -i "http://127.0.0.1:8091/pools/default/buckets" \
     -d name=phpfastcache \
     -d ramQuotaMB=256 \

bin/ci/scripts/setup_couchdb.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+export COUCHDB_HOST=localhost
+export COUCHDB_PORT=5984
+export COUCHDB_VERSION=2.3.1
+
+echo "# Running Docker couchdb image"
+docker run -d -p $COUCHDB_PORT:$COUCHDB_PORT couchdb:$COUCHDB_VERSION --with-haproxy --with-admin-party-please -n 1
+
+check_db() {
+  # Allow 4xx errors not to break the connexion check
+  curl --silent http://$COUCHDB_HOST:$COUCHDB_PORT > /dev/null
+  echo $?
+}
+
+# Echo with
+i=1
+numbered_echo() {
+  echo "[$i] $*"
+  i=$(($i+1))
+}
+
+until [[ $(check_db) = 0 ]]; do
+  >&2 numbered_echo "Waiting for Couchdb Server to be available"
+  if [[ i  -gt 10 ]]; then
+    echo "Wait time exceeded, aborting".
+    break;
+   fi
+  sleep 1
+done
+echo "# Couchbdb Server Online"
+
+echo "# Creating Couchdb admin"
+curl -s -X PUT -s -o /dev/null -w "HTTP %{response_code}" $COUCHDB_HOST:${COUCHDB_PORT}/_node/_local/_config/admins/admin -d '"travis"'
+# curl -X PUT $COUCHDB_HOST:5984/phpfastcache_test_database
+
+printf "\n\n\n"

bin/ci/scripts/setup_mongodb.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
+echo "# Setting up Mongodb database and user"
 mongo pfc_test --eval 'db.createUser({user:"travis",pwd:"test",roles:["readWrite"]});'

tests/Mongodb.test.php

@@ -20,12 +20,6 @@
     ->setUsername('travis')
     ->setPassword('test');
 
-try{
-    $cacheInstance = CacheManager::getInstance('Mongodb', $config);
-}catch(PhpfastcacheDriverCheckException $exception){
-    $testHelper->exceptionHandler($exception);
-    $testHelper->terminateTest();
-}
-
+$cacheInstance = CacheManager::getInstance('Mongodb', $config);
 $testHelper->runCRUDTests($cacheInstance);
 $testHelper->terminateTest();

tests/PredisCustomClient.test.php

@@ -20,6 +20,7 @@
       throw new PhpfastcacheDriverCheckException('Predis library is not installed');
     }
 
+    $testHelper->mutePhpNotices();
     $predisClient = new PredisClient([
       'host' => '127.0.0.1',
       'port' =>  6379,
@@ -29,17 +30,7 @@
     $predisClient->connect();
 
     $cacheInstance = CacheManager::getInstance('Predis', (new PredisConfig())->setPredisClient($predisClient));
-    $cacheKey = 'predisCustomClient';
-    $cacheItem = $cacheInstance->getItem($cacheKey);
-    $cacheItem->set(1337);
-    $cacheInstance->save($cacheItem);
-    $cacheInstance->detachAllItems();
-    unset($cacheItem);
-    if($cacheInstance->getItem($cacheKey)->get() === 1337){
-        $testHelper->assertPass('Successfully written and read data from outside Predis client');
-    }else{
-        $testHelper->assertFail('Error writing or reading data from outside Predis client');
-    }
+    $testHelper->runCRUDTests($cacheInstance);
 }catch (\RedisException $e){
     $testHelper->assertFail('A Predis exception occurred: ' . $e->getMessage());
 }

tests/issues/Github-522.test.php

@@ -11,8 +11,9 @@
 chdir(__DIR__);
 require_once __DIR__ . '/../../vendor/autoload.php';
 $testHelper = new TestHelper('Github issue #522 - Predis returns wrong type hints');
+$testHelper->mutePhpNotices();
 // Hide php Redis extension notice by using a little @
-$cacheInstance = @CacheManager::getInstance('Predis');
+$cacheInstance = CacheManager::getInstance('Predis');
 $stringObject = new stdClass;
 $stringObject->test = '';
 

tests/issues/Github-627.test.php

@@ -14,6 +14,7 @@
 chdir(__DIR__);
 require_once __DIR__ . '/../../vendor/autoload.php';
 $testHelper = new TestHelper('Github issue #627 - Redis/Predis "prefix" option');
+$testHelper->mutePhpNotices();
 $redisInstance = CacheManager::getInstance('Redis', new RedisConfig(['optPrefix' => uniqid('pfc', true) . '_']));
 $predisInstance = CacheManager::getInstance('Predis', new PredisConfig(['optPrefix' => uniqid('pfc', true) . '_']));