Minor improvements to some session tests.

michael-grunder · michael-grunder · commit c0d6f04298e3 · 2024-05-09T20:45:07.000-07:00
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -7462,7 +7462,7 @@ public function testSession_lock_ttlMaxExecutionTime()
         $end = microtime(true);
         $elapsedTime = $end - $start;
 
-        $this->assertTrue($elapsedTime < 3);
+        $this->assertLess($elapsedTime, 3);
         $this->assertTrue($sessionSuccessful);
     }
 
@@ -7543,7 +7543,7 @@ public function testSession_defaultLockRetryCount()
         $end = microtime(true);
         $elapsedTime = $end - $start;
 
-        $this->assertTrue($elapsedTime > 2 && $elapsedTime < 3);
+        $this->assertBetween($elapsedTime, 2, 3);
         $this->assertFalse($sessionSuccessful);
     }
 
@@ -7931,7 +7931,14 @@ private function startSessionProcess($sessionId, $sleepTime, $background,
 
         exec($command, $output);
 
-        return ($background || (count($output) == 1 && $output[0] == 'SUCCESS'));
+        if ($background)
+            return true;
+
+        $result = $output[0] == 'SUCCESS';
+
+        // var_dump(['command' => $command, 'output' => $output, 'result' => $result]);
+
+        return $result;
     }
 
     /**
@@ -8006,11 +8013,12 @@ private function getPhpCommand($script)
         if (!$cmd) {
             $cmd  = (getenv('TEST_PHP_EXECUTABLE') ?: PHP_BINARY);
 
-            if ($test_args = getenv('TEST_PHP_ARGS')) {
-                $cmd .= ' ';
-                $cmd .= $test_args;
+            $test_args = getenv('TEST_PHP_ARGS');
+            if ($test_args !== false) {
+                $cmd .= ' ' . $test_args;
             } else {
-                /* Only append specific extension directives if PHP hasn't been compiled with what we need statically */
+                /* Only append specific extension directives if PHP hasn't been compiled
+ *                 with what we need statically */
                 $modules   = shell_exec("$cmd --no-php-ini -m");
 
                 /* Determine if we need to specifically add extensions */
diff --git a/tests/TestSuite.php b/tests/TestSuite.php
@@ -181,6 +181,21 @@ protected function assertLess($a, $b) {
             $bt[0]["file"], $bt[0]["line"], $bt[1]["function"]);
     }
 
+    protected function assertBetween($value, $min, $max, bool $exclusive = false) {
+        if ($exclusive) {
+            if ($value > $min && $value < $max)
+                return;
+        } else {
+            if ($value >= $min && $value <= $max)
+                return;
+        }
+
+        $bt = debug_backtrace(false);
+        self::$errors []= sprintf("Assertion failed (%s not between %s and %s): %s:%d (%s)\n",
+            print_r($value, true), print_r($min, true), print_r($max, true),
+            $bt[0]["file"], $bt[0]["line"], $bt[1]["function"]);
+    }
+
     protected function assertEquals($a, $b) {
         if($a === $b)
             return;
