Fixes for session and fpm tests to make them more reliable in Travis CI

1. Increased the timeout on sapi/fpm tests to match the cli server
2. Fixed user session GC function to return number of sessions removed
3. Disabled session GC in session_set_save_handler_basic.phpt

diff --git a/ext/session/tests/save_handler.inc b/ext/session/tests/save_handler.inc
index 301a2d65c5f4aa33ed042e3c409e414c89b709a6..4d5ac75d03f6ad09c6bd3d713221110c55b31ed5 100644 (file)
--- a/ext/session/tests/save_handler.inc
+++ b/ext/session/tests/save_handler.inc
@@ -106,13 +106,15 @@ function gc($maxlifetime) {
     // long $maxlifetime - GC TTL in seconds. Default: session.gc_maxlifetime
 
     global $session_save_path, $name;
+    $gc_cnt = 0;
     $directory = opendir($session_save_path."/");
     $length = strlen(SESSION_FILE_PREFIX);
     while (($file = readdir($directory)) !== FALSE) {
         $qualified = ($session_save_path."/".$file); 
         if (is_file($qualified) === TRUE) {
-            if (substr($file, 0, $length) === SESSION_FILE_PREFIX) {
+            if (substr($file, 0, $length) === SESSION_FILE_PREFIX && (filemtime($qualified) + $maxlifetime <= time() )) {
                 unlink($qualified);
+                $gc_cnt++;
             }
         }
     }
@@ -121,7 +123,7 @@ function gc($maxlifetime) {
     // SHOULD return long (number of deleted sessions).
     // Returning TRUE works also, but it will not report correct number of deleted sessions.
     // Return negative value for error. FALSE does not work because it's the same as 0.
-    return 1;
+    return $gc_cnt;
 }
 
 /* Create new secure session ID */

diff --git a/ext/session/tests/session_set_save_handler_basic.phpt b/ext/session/tests/session_set_save_handler_basic.phpt
index 5342acc92d8a12276f47a33eaa44ad684ac6e4b1..6b99e8d37d3f0f9610d81ed9975357fc3d004e5b 100644 (file)
--- a/ext/session/tests/session_set_save_handler_basic.phpt
+++ b/ext/session/tests/session_set_save_handler_basic.phpt
@@ -3,6 +3,7 @@ Test session_set_save_handler() function : basic functionality
 --INI--
 session.save_path=
 session.name=PHPSESSID
+session.gc_probability=0
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--

diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt
index 70a964d187d3b5603a7224a338190114255cc9b3..5445b44c6dd1189b35f750542ed52d687a31ac91 100644 (file)
--- a/ext/session/tests/session_set_save_handler_variation4.phpt
+++ b/ext/session/tests/session_set_save_handler_variation4.phpt
@@ -54,7 +54,7 @@ ob_end_flush();
 Open [%s,PHPSESSID]
 Read [%s,%s]
 GC [0]
-1 deleted
+2 deleted
 array(3) {
   ["Blah"]=>
   string(12) "Hello World!"

diff --git a/sapi/fpm/tests/002.phpt b/sapi/fpm/tests/002.phpt
index 89e431849ab3b36e56bf528ec680297fa9aebead..77e89afad350c775cd5b949d5a7724a1b427251f 100644 (file)
--- a/sapi/fpm/tests/002.phpt
+++ b/sapi/fpm/tests/002.phpt
@@ -26,8 +26,8 @@ $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
     fpm_display_log($tail, 2);
     $i = 0;
-    while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) {
-        usleep(10000);
+    while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) {
+        usleep(25000);
     }
     if ($fp) {
         echo "Done\n";

diff --git a/sapi/fpm/tests/003.phpt b/sapi/fpm/tests/003.phpt
index a4c04ae9ce97149e23c82eb1b78e4cf41df02178..8b5265c7f12c217b6ae2e7240629603a3d5364f9 100644 (file)
--- a/sapi/fpm/tests/003.phpt
+++ b/sapi/fpm/tests/003.phpt
@@ -29,8 +29,8 @@ $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
     fpm_display_log($tail, 2);
     $i = 0;
-    while (($i++ < 30) && !($fp = fsockopen('[::1]', $port))) {
-        usleep(10000);
+    while (($i++ < 60) && !($fp = fsockopen('[::1]', $port))) {
+        usleep(25000);
     }
     if ($fp) {
         echo "Done\n";

diff --git a/sapi/fpm/tests/004.phpt b/sapi/fpm/tests/004.phpt
index 565819aed42c3cfe418d3ec80270d91e60940390..0b58a6d36003f8776050bb5153b5dda1a762f2ef 100644 (file)
--- a/sapi/fpm/tests/004.phpt
+++ b/sapi/fpm/tests/004.phpt
@@ -29,15 +29,15 @@ $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
     fpm_display_log($tail, 2);
     $i = 0;
-    while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) {
-        usleep(10000);
+    while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) {
+        usleep(25000);
     }
     if ($fp) {
         echo "Done IPv4\n";
         fclose($fp);
     }
-    while (($i++ < 30) && !($fp = @fsockopen('[::1]', $port))) {
-        usleep(10000);
+    while (($i++ < 60) && !($fp = @fsockopen('[::1]', $port))) {
+        usleep(25000);
     }
     if ($fp) {
         echo "Done IPv6\n";

diff --git a/sapi/fpm/tests/013.phpt b/sapi/fpm/tests/013.phpt
index 8d6a9d1d85665edc7cb5de6ef795769093ddcfb5..aa84c276a3bc71839f01a2be912b1e8dd20bd432 100644 (file)
--- a/sapi/fpm/tests/013.phpt
+++ b/sapi/fpm/tests/013.phpt
@@ -27,8 +27,8 @@ EOT;
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
     $i = 0;
-       while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) {
-               usleep(10000);
+       while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) {
+               usleep(25000);
        }
        if ($fp) {
                echo "Started\n";
@@ -51,4 +51,4 @@ Done
 <?php
        $logfile = dirname(__FILE__).'/php-fpm.log.tmp';
        @unlink($logfile);
-?>
\ No newline at end of file
+?>

diff --git a/sapi/fpm/tests/014.phpt b/sapi/fpm/tests/014.phpt
index ee0e549cc574c7762bd0ed4f10971b01f2407579..8c0d5bf29eec31c4c4dd02b67a4c9f265b424e43 100644 (file)
--- a/sapi/fpm/tests/014.phpt
+++ b/sapi/fpm/tests/014.phpt
@@ -27,8 +27,8 @@ EOT;
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
     $i = 0;
-       while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) {
-               usleep(10000);
+       while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) {
+               usleep(25000);
        }
        if ($fp) {
                echo "Started\n";
@@ -51,4 +51,4 @@ Done
 <?php
        $logfile = dirname(__FILE__).'/php-fpm.log.tmp';
        @unlink($logfile);
-?>
\ No newline at end of file
+?>

diff --git a/sapi/fpm/tests/015.phpt b/sapi/fpm/tests/015.phpt
index c7af5f7572601be7b28ba82039161f50f81aa4a8..6c092e371a3023225bdd0356421c3635955987bb 100644 (file)
--- a/sapi/fpm/tests/015.phpt
+++ b/sapi/fpm/tests/015.phpt
@@ -42,8 +42,8 @@ EOT;
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
     $i = 0;
-       while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port1))) {
-               usleep(10000);
+       while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port1))) {
+               usleep(25000);
        }
        if ($fp) {
                echo "Started\n";
@@ -88,4 +88,4 @@ Done
 <?php
        $logfile = dirname(__FILE__).'/php-fpm.log.tmp';
        @unlink($logfile);
-?>
\ No newline at end of file
+?>