Merge pull request #5463 from kenjis/fix-ThrottleTest

refactor: fix `ThrottleTest::testFlooding`

Author: kenjis

system/Throttle/Throttler.php

@@ -100,7 +100,7 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
             // If it hasn't been created, then we'll set it to the maximum
             // capacity - 1, and save it to the cache.
             $this->cache->save($tokenName, $capacity - $cost, $seconds);
-            $this->cache->save($tokenName . 'Time', time(), $seconds);
+            $this->cache->save($tokenName . 'Time', $this->time(), $seconds);
 
             return true;
         }
@@ -129,7 +129,7 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
         // we need to decrement the number of available tokens.
         if ($tokens >= 1) {
             $this->cache->save($tokenName, $tokens - $cost, $seconds);
-            $this->cache->save($tokenName . 'Time', time(), $seconds);
+            $this->cache->save($tokenName . 'Time', $this->time(), $seconds);
 
             return true;
         }
@@ -164,6 +164,8 @@ public function setTestTime(int $time)
 
     /**
      * Return the test time, defaulting to current.
+     *
+     * @TODO should be private
      */
     public function time(): int
     {

tests/system/Throttle/ThrottleTest.php

@@ -127,7 +127,10 @@ public function testOverload()
 
     public function testFlooding()
     {
+        $time = 1639441295;
+
         $throttler = new Throttler($this->cache);
+        $throttler->setTestTime($time);
 
         $rate = 60; // allow 1 per second after the bucket is emptied
         $cost = 1;
@@ -141,7 +144,7 @@ public function testFlooding()
         $this->assertFalse($throttler->check('127.0.0.1', $rate, MINUTE, $cost));
         $this->assertSame(0, $this->cache->get('throttler_127.0.0.1'));
 
-        $throttler = $throttler->setTestTime(strtotime('+10 seconds'));
+        $throttler = $throttler->setTestTime($time + 10);
 
         $this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE, 0));
         $this->assertSame(10.0, round($this->cache->get('throttler_127.0.0.1')));