Merge branch 'main' into fixMultinamespace

humbug · Sep 2, 2024 · e96ce1d · e96ce1d
2 parents 7293887 + 5d3fda6
commit e96ce1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/tests/AutoReview/GAE2ETest.php b/tests/AutoReview/GAE2ETest.php
@@ -17,6 +17,7 @@
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
 use function array_diff;
+use function sort;
 
 /**
  * @internal
@@ -31,7 +32,9 @@ class GAE2ETest extends TestCase
 
     public function test_github_actions_executes_all_the_e2e_tests(): void
     {
-        $expected = array_values(array_diff(E2ECollector::getE2ENames(), self::IGNORED_E2E_TESTS));
+        $expected = array_diff(E2ECollector::getE2ENames(), self::IGNORED_E2E_TESTS);
+        sort($expected);
+
         $actual = GAE2ECollector::getExecutedE2ETests();
 
         self::assertEqualsCanonicalizing($expected, $actual);

diff --git a/tests/AutoReview/MakefileE2ETest.php b/tests/AutoReview/MakefileE2ETest.php
@@ -23,6 +23,7 @@
 use function array_values;
 use function current;
 use function Safe\file_get_contents;
+use function sort;
 use function str_starts_with;
 
 /**
@@ -93,7 +94,10 @@ private static function retrieveE2ERule(): array
         $e2eRule = current($e2eRules);
         self::assertNotFalse($e2eRule, 'Expected to find the e2e rule in the Makefile.');
 
-        return $e2eRule->getPrerequisites();
+        $finalE2eRules = $e2eRule->getPrerequisites();
+        sort($finalE2eRules);
+
+        return $finalE2eRules;
     }
 
     /**