Merge pull request #17 from pestphp/fix/determine-inititial-test-suit…

…e-duration-in-parallel Fix determining initial test suite duration in parallel
pestphp · Sep 22, 2024 · e10dbdc · e10dbdc
2 parents a1dca5f + 2a6c0bd
commit e10dbdc
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 18 deletions.
diff --git a/src/Contracts/MutationTestRunner.php b/src/Contracts/MutationTestRunner.php
@@ -15,6 +15,8 @@ public function isEnabled(): bool;
      */
     public function setOriginalArguments(array $arguments): void;
 
+    public function setStartTime(float $startTime): void;
+
     public function isCodeCoverageRequested(): bool;
 
     public function run(): int;

diff --git a/src/MutationTest.php b/src/MutationTest.php
@@ -104,10 +104,9 @@ public function start(array $coveredLines, Configuration $configuration, array $
     private function calculateTimeout(): int
     {
         $initialTestSuiteDuration = Container::getInstance()->get(TelemetryRepository::class) // @phpstan-ignore-line
-            ->getInitialTestSuiteDuration()
-            ->seconds();
+            ->getInitialTestSuiteDuration();
 
-        return $initialTestSuiteDuration + max(5, (int) ($initialTestSuiteDuration * 0.2));
+        return (int) ($initialTestSuiteDuration + max(5, $initialTestSuiteDuration * 0.2));
     }
 
     public function hasFinished(): bool

diff --git a/src/Plugins/Mutate.php b/src/Plugins/Mutate.php
@@ -135,6 +135,7 @@ public function handleArguments(array $arguments): array
             ->cliConfiguration->fromArguments($arguments);
 
         $mutationTestRunner->setOriginalArguments($arguments);
+        $mutationTestRunner->setStartTime(microtime(true));
 
         return $arguments;
     }

diff --git a/src/Repositories/TelemetryRepository.php b/src/Repositories/TelemetryRepository.php
@@ -4,18 +4,16 @@
 
 namespace Pest\Mutate\Repositories;
 
-use PHPUnit\Event\Telemetry\Duration;
-
 class TelemetryRepository
 {
-    private Duration $initialTestSuiteDuration;
+    private float $initialTestSuiteDuration;
 
-    public function initialTestSuiteDuration(Duration $duration): void
+    public function initialTestSuiteDuration(float $duration): void
     {
         $this->initialTestSuiteDuration = $duration;
     }
 
-    public function getInitialTestSuiteDuration(): Duration
+    public function getInitialTestSuiteDuration(): float
     {
         return $this->initialTestSuiteDuration;
     }

diff --git a/src/Subscribers/EnsureInitialTestRunWasSuccessful.php b/src/Subscribers/EnsureInitialTestRunWasSuccessful.php
@@ -4,8 +4,6 @@
 
 namespace Pest\Mutate\Subscribers;
 
-use Pest\Mutate\Repositories\TelemetryRepository;
-use Pest\Support\Container;
 use PHPUnit\Event\Application\Finished;
 use PHPUnit\Event\Application\FinishedSubscriber;
 
@@ -14,11 +12,5 @@
  */
 final class EnsureInitialTestRunWasSuccessful implements FinishedSubscriber
 {
-    public function notify(Finished $event): void
-    {
-        // @phpstan-ignore-next-line
-        Container::getInstance()->get(TelemetryRepository::class)->initialTestSuiteDuration(
-            $event->telemetryInfo()->durationSinceStart()
-        );
-    }
+    public function notify(Finished $event): void {}
 }
diff --git a/src/Tester/MutationTestRunner.php b/src/Tester/MutationTestRunner.php
@@ -12,6 +12,7 @@
 use Pest\Mutate\MutationTest;
 use Pest\Mutate\Plugins\Mutate;
 use Pest\Mutate\Repositories\ConfigurationRepository;
+use Pest\Mutate\Repositories\TelemetryRepository;
 use Pest\Mutate\Support\Configuration\Configuration;
 use Pest\Mutate\Support\FileFinder;
 use Pest\Mutate\Support\MutationGenerator;
@@ -38,6 +39,8 @@ class MutationTestRunner implements MutationTestRunnerContract
      */
     private array $runningTests;
 
+    private float $startTime;
+
     public static function fake(): MutationTestRunnerFake
     {
         $fake = new MutationTestRunnerFake;
@@ -90,7 +93,9 @@ public function isCodeCoverageRequested(): bool
 
     public function run(): int
     {
-        $start = microtime(true);
+        Container::getInstance()->get(TelemetryRepository::class)->initialTestSuiteDuration( // @phpstan-ignore-line
+            microtime(true) - $this->startTime
+        );
 
         if (! Coverage::isAvailable() || ! file_exists($reportPath = Coverage::getPath())) {
             Container::getInstance()->get(Printer::class)->reportError('No coverage report found, aborting mutation testing.'); // @phpstan-ignore-line
@@ -294,4 +299,9 @@ private function clearCacheIfPluginVersionChanged(): void
 
         $cache->set('mutation-plugin-version', $pluginVersion); // @phpstan-ignore-line
     }
+
+    public function setStartTime(float $startTime): void
+    {
+        $this->startTime = $startTime;
+    }
 }
diff --git a/src/Tester/MutationTestRunnerFake.php b/src/Tester/MutationTestRunnerFake.php
@@ -29,4 +29,9 @@ public function setOriginalArguments(array $arguments): void
     {
         // TODO: Implement setOriginalArguments() method.
     }
+
+    public function setStartTime(float $startTime): void
+    {
+        // TODO: Implement setStartTime() method.
+    }
 }