Fix flaky test and OBJECT in a pipeline.

michael-grunder · michael-grunder · commit a7f51f70ccbb · 2023-10-10T18:39:08.000-07:00
* We weren't properly passing `z_tab` through to the underlying OBJECT
  handler, which was causing PhpRedis to crash if you tried to execute
  the OBJECT command in a pipeline.

* Rework the `testTouch` unit test to try and avoid erroneous failures
  due to CI instance CPU scheduling.
diff --git a/library.c b/library.c
@@ -1519,9 +1519,9 @@ redis_object_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval
     ZEND_ASSERT(ctx == PHPREDIS_CTX_PTR || ctx == PHPREDIS_CTX_PTR + 1);
 
     if (ctx == PHPREDIS_CTX_PTR) {
-        return redis_long_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
+        return redis_long_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab, NULL);
     } else {
-        return redis_string_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
+        return redis_string_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab, NULL);
     }
 }
 
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -983,13 +983,18 @@ public function testTouch() {
         $this->redis->del('notakey');
 
         $this->assertTrue($this->redis->mset(['{idle}1' => 'beep', '{idle}2' => 'boop']));
-        usleep(1100000);
-        $this->assertTrue($this->redis->object('idletime', '{idle}1') >= 1);
-        $this->assertTrue($this->redis->object('idletime', '{idle}2') >= 1);
+        usleep(2100000);
+        $this->assertTrue($this->redis->object('idletime', '{idle}1') >= 2);
+        $this->assertTrue($this->redis->object('idletime', '{idle}2') >= 2);
 
         $this->assertEquals(2, $this->redis->touch('{idle}1', '{idle}2', '{idle}notakey'));
-        $this->assertTrue($this->redis->object('idletime', '{idle}1') == 0);
-        $this->assertTrue($this->redis->object('idletime', '{idle}2') == 0);
+        $idle1 = $this->redis->object('idletime', '{idle}1');
+        $idle2 = $this->redis->object('idletime', '{idle}2');
+
+        /* We're not testing if idle is 0 because CPU scheduling on GitHub CI
+         * potatoes can cause that to erroneously fail. */
+        $this->assertTrue($idle1 < 2);
+        $this->assertTrue($idle2 < 2);
     }
 
     public function testKeys()

Original file line number	Diff line number	Diff line change
`@@ -1519,9 +1519,9 @@ redis_object_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval`
`1519`	`1519`	`ZEND_ASSERT(ctx == PHPREDIS_CTX_PTR \|\| ctx == PHPREDIS_CTX_PTR + 1);`
`1520`	`1520`
`1521`	`1521`	`if (ctx == PHPREDIS_CTX_PTR) {`
`1522`		`- return redis_long_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);`
	`1522`	`+ return redis_long_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab, NULL);`
`1523`	`1523`	`} else {`
`1524`		`- return redis_string_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);`
	`1524`	`+ return redis_string_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab, NULL);`
`1525`	`1525`	`}`
`1526`	`1526`	`}`
`1527`	`1527`