minor #50117 [Scheduler] fix brittle test (kbond)

nicolas-grekas · nicolas-grekas · commit 6c2819699dfb · 2023-04-23T10:26:31.000+02:00
This PR was merged into the 6.3 branch. Discussion ---------- [Scheduler] fix brittle test | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a This fixes the brittle test I introduced in #50113. Commits ------- 375319d [Scheduler] fix brittle test
diff --git a/src/Symfony/Component/Scheduler/Tests/SchedulerTest.php b/src/Symfony/Component/Scheduler/Tests/SchedulerTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Scheduler\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Clock\MockClock;
 use Symfony\Component\Scheduler\RecurringMessage;
 use Symfony\Component\Scheduler\Schedule;
 use Symfony\Component\Scheduler\Scheduler;
@@ -21,11 +23,12 @@ class SchedulerTest extends TestCase
     public function testCanRunAndStop()
     {
         $handler = new Handler();
-        $schedule = (new Schedule())->add(RecurringMessage::every('1 millisecond', new Message()));
-        $scheduler = new Scheduler([Message::class => $handler], [$schedule]);
+        $handler->clock = $clock = new MockClock();
+        $schedule = (new Schedule())->add(RecurringMessage::every('1 second', new Message()));
+        $scheduler = new Scheduler([Message::class => $handler], [$schedule], $clock);
         $handler->scheduler = $scheduler;
 
-        $scheduler->run(['sleep' => 0]);
+        $scheduler->run(['sleep' => 1]);
 
         $this->assertSame(3, $handler->count);
     }
@@ -39,11 +42,16 @@ class Handler
 {
     public int $count = 0;
     public Scheduler $scheduler;
+    public ClockInterface $clock;
 
     public function __invoke(Message $message): void
     {
         if (3 === ++$this->count) {
             $this->scheduler->stop();
+
+            return;
         }
+
+        $this->clock->sleep(1);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`namespace Symfony\Component\Scheduler\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Component\Clock\ClockInterface;`
	`16`	`+use Symfony\Component\Clock\MockClock;`
`15`	`17`	`use Symfony\Component\Scheduler\RecurringMessage;`
`16`	`18`	`use Symfony\Component\Scheduler\Schedule;`
`17`	`19`	`use Symfony\Component\Scheduler\Scheduler;`
`@@ -21,11 +23,12 @@ class SchedulerTest extends TestCase`
`21`	`23`	`public function testCanRunAndStop()`
`22`	`24`	`{`
`23`	`25`	`$handler = new Handler();`
`24`		`- $schedule = (new Schedule())->add(RecurringMessage::every('1 millisecond', new Message()));`
`25`		`- $scheduler = new Scheduler([Message::class => $handler], [$schedule]);`
	`26`	`+ $handler->clock = $clock = new MockClock();`
	`27`	`+ $schedule = (new Schedule())->add(RecurringMessage::every('1 second', new Message()));`
	`28`	`+ $scheduler = new Scheduler([Message::class => $handler], [$schedule], $clock);`
`26`	`29`	`$handler->scheduler = $scheduler;`
`27`	`30`
`28`		`- $scheduler->run(['sleep' => 0]);`
	`31`	`+ $scheduler->run(['sleep' => 1]);`
`29`	`32`
`30`	`33`	`$this->assertSame(3, $handler->count);`
`31`	`34`	`}`
`@@ -39,11 +42,16 @@ class Handler`
`39`	`42`	`{`
`40`	`43`	`public int $count = 0;`
`41`	`44`	`public Scheduler $scheduler;`
	`45`	`+ public ClockInterface $clock;`
`42`	`46`
`43`	`47`	`public function __invoke(Message $message): void`
`44`	`48`	`{`
`45`	`49`	`if (3 === ++$this->count) {`
`46`	`50`	`$this->scheduler->stop();`
	`51`	`+`
	`52`	`+ return;`
`47`	`53`	`}`
	`54`	`+`
	`55`	`+ $this->clock->sleep(1);`
`48`	`56`	`}`
`49`	`57`	`}`