split test suite for better parallelism

ildyria · ildyria · commit 81a706705459 · 2025-11-15T19:34:01.000+01:00
diff --git a/.github/workflows/php_tests.yml b/.github/workflows/php_tests.yml
@@ -31,6 +31,7 @@ jobs:
           - Feature_v2
           - Install
           - Webshop
+          - ImageProcessing
         exclude:
         # Some skips to reduce the number of runs
           - php-version: 8.4
@@ -39,6 +40,8 @@ jobs:
             test-suite: Feature_v2
           - php-version: 8.4
             test-suite: Webshop
+          - php-version: 8.4
+            test-suite: ImageProcessing
     # Service containers to run with `container-job`
     services:
       # Label used to access the service container
diff --git a/Makefile b/Makefile
@@ -148,6 +148,9 @@ test_webshop:
 test_install:
 	vendor/bin/phpunit --testsuite Install --stop-on-failure --stop-on-error --no-coverage --log-junit report_install.xml
 
+test_ImageProcessing:
+	vendor/bin/phpunit --testsuite ImageProcessing --stop-on-failure --stop-on-error --no-coverage --log-junit report_imageprocessing.xml
+
 test_v2:
 	vendor/bin/phpunit --testsuite Feature_v2 --stop-on-failure --stop-on-error --no-coverage --log-junit report_v2.xml
 
diff --git a/codecov.yml b/codecov.yml
@@ -3,7 +3,7 @@ codecov:
   require_ci_to_pass: true
   notify:
     wait_for_ci: true
-    after_n_builds: 15
+    after_n_builds: 18
 comment:
   behavior: default
   require_base: false
@@ -24,7 +24,6 @@ ignore:
 - "^app/Console/.*"
 - "^app/Exceptions/.*"
 - "^app/Http/Middleware/VerifyCsrfToken.*"
-- "^app/Http/Middleware/VerifyCsrfToken.*"
 - "^app/Providers/BroadcastServiceProvider.*"
 - "^app/Jobs/UploadSizeVariantToS3Job.php"
 # We do not test those
diff --git a/phpunit.ci.xml b/phpunit.ci.xml
@@ -20,6 +20,9 @@
     <testsuite name="Install">
       <directory suffix="Test.php">./tests/Install</directory>
     </testsuite>
+    <testsuite name="ImageProcessing">
+      <directory suffix="Test.php">./tests/ImageProcessing</directory>
+    </testsuite>
     <testsuite name="Webshop">
       <directory suffix="Test.php">./tests/Webshop</directory>
       <exclude>./tests/Webshop/BaseCheckoutControllerTest.php</exclude>
diff --git a/phpunit.pgsql.xml b/phpunit.pgsql.xml
@@ -20,6 +20,9 @@
     <testsuite name="Install">
       <directory suffix="Test.php">./tests/Install</directory>
     </testsuite>
+    <testsuite name="ImageProcessing">
+      <directory suffix="Test.php">./tests/ImageProcessing</directory>
+    </testsuite>
     <testsuite name="Webshop">
       <directory suffix="Test.php">./tests/Webshop</directory>
       <exclude>./tests/Webshop/BaseCheckoutControllerTest.php</exclude>
diff --git a/phpunit.xml b/phpunit.xml
@@ -20,6 +20,9 @@
     <testsuite name="Install">
       <directory suffix="Test.php">./tests/Install</directory>
     </testsuite>
+    <testsuite name="ImageProcessing">
+      <directory suffix="Test.php">./tests/ImageProcessing</directory>
+    </testsuite>
     <testsuite name="Webshop">
       <directory suffix="Test.php">./tests/Webshop</directory>
       <exclude>./tests/Webshop/BaseCheckoutControllerTest.php</exclude>
diff --git a/tests/ImageProcessing/Image/Handlers/BaseImageHandler.php b/tests/ImageProcessing/Image/Handlers/BaseImageHandler.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Image\Handlers;
+namespace Tests\ImageProcessing\Image\Handlers;
 
 use App\Facades\Helpers;
 use App\Models\Configs;
diff --git a/tests/ImageProcessing/Image/Handlers/PhotosAddHandlerGDTest.php b/tests/ImageProcessing/Image/Handlers/PhotosAddHandlerGDTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Image\Handlers;
+namespace Tests\ImageProcessing\Image\Handlers;
 
 use Tests\Constants\TestConstants;
 use Tests\Traits\InteractsWithRaw;
diff --git a/tests/ImageProcessing/Image/Handlers/PhotosAddHandlerImagickTest.php b/tests/ImageProcessing/Image/Handlers/PhotosAddHandlerImagickTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Image\Handlers;
+namespace Tests\ImageProcessing\Image\Handlers;
 
 use Tests\Constants\TestConstants;
 use Tests\Traits\InteractsWithRaw;
diff --git a/tests/ImageProcessing/Image/WatermarkerTest.php b/tests/ImageProcessing/Image/WatermarkerTest.php
@@ -16,14 +16,14 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Image;
+namespace Tests\ImageProcessing\Image;
 
 use App\Image\Watermarker;
 use App\Models\AccessPermission;
 use App\Models\Configs;
 use Illuminate\Support\Facades\Auth;
 use Tests\Constants\TestConstants;
-use Tests\Feature_v2\Image\Handlers\BaseImageHandler;
+use Tests\ImageProcessing\Image\Handlers\BaseImageHandler;
 use Tests\Traits\InteractsWithRaw;
 use Tests\Traits\RequireSE;
 use Tests\Traits\RequiresImageHandler;
diff --git a/tests/ImageProcessing/Import/ImportFromServerBrowseTest.php b/tests/ImageProcessing/Import/ImportFromServerBrowseTest.php
@@ -6,7 +6,7 @@
  * Copyright (c) 2018-2025 LycheeOrg.
  */
 
-namespace Tests\Feature_v2\Import;
+namespace Tests\ImageProcessing\Import;
 
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
 
@@ -38,6 +38,6 @@ public function testBrowseEndpointAsOwner(): void
 		// We have to sort in order to have a predictable order for the test.
 		// The order returned by the filesystem is not predictable.
 		sort($content);
-		self::assertEquals($content, ['..', 'Constants', 'Feature_v2', 'Install', 'Samples', 'Traits', 'Unit', 'Webshop']);
+		self::assertEquals( ['..', 'Constants', 'Feature_v2',  'ImageProcessing', 'Install', 'Samples', 'Traits', 'Unit', 'Webshop'], $content);
 	}
 }
diff --git a/tests/ImageProcessing/Import/ImportFromServerOptionsTest.php b/tests/ImageProcessing/Import/ImportFromServerOptionsTest.php
@@ -6,7 +6,7 @@
  * Copyright (c) 2018-2025 LycheeOrg.
  */
 
-namespace Tests\Feature_v2\Import;
+namespace Tests\ImageProcessing\Import;
 
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
 
diff --git a/tests/ImageProcessing/Import/ImportFromServerTest.php b/tests/ImageProcessing/Import/ImportFromServerTest.php
@@ -6,7 +6,7 @@
  * Copyright (c) 2018-2025 LycheeOrg.
  */
 
-namespace Tests\Feature_v2\Import;
+namespace Tests\ImageProcessing\Import;
 
 use Illuminate\Support\Facades\Queue;
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
diff --git a/tests/ImageProcessing/Jobs/ExtractColoursJobTest.php b/tests/ImageProcessing/Jobs/ExtractColoursJobTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Jobs;
+namespace Tests\ImageProcessing\Jobs;
 
 use App\Exceptions\Internal\InvalidConfigOption;
 use App\Jobs\ExtractColoursJob;
diff --git a/tests/ImageProcessing/Photo/HasUrlGeneratorTest.php b/tests/ImageProcessing/Photo/HasUrlGeneratorTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use App\Models\Configs;
 use App\Models\Extensions\HasUrlGenerator;
diff --git a/tests/ImageProcessing/Photo/PhotoAddTest.php b/tests/ImageProcessing/Photo/PhotoAddTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use Tests\Constants\TestConstants;
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
diff --git a/tests/ImageProcessing/Photo/PhotoCopyTest.php b/tests/ImageProcessing/Photo/PhotoCopyTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
 
diff --git a/tests/ImageProcessing/Photo/PhotoDeleteTest.php b/tests/ImageProcessing/Photo/PhotoDeleteTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
 
diff --git a/tests/ImageProcessing/Photo/PhotoEditTest.php b/tests/ImageProcessing/Photo/PhotoEditTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use Illuminate\Support\Facades\DB;
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
diff --git a/tests/ImageProcessing/Photo/PhotoFromUrlTest.php b/tests/ImageProcessing/Photo/PhotoFromUrlTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use Tests\Constants\TestConstants;
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
diff --git a/tests/ImageProcessing/Photo/PhotoMoveTest.php b/tests/ImageProcessing/Photo/PhotoMoveTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
 
diff --git a/tests/ImageProcessing/Photo/PhotoRenameTest.php b/tests/ImageProcessing/Photo/PhotoRenameTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
 
diff --git a/tests/ImageProcessing/Photo/PhotoRotateTest.php b/tests/ImageProcessing/Photo/PhotoRotateTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use App\Models\Configs;
 use Tests\Constants\TestConstants;
diff --git a/tests/ImageProcessing/Photo/PhotoStarTest.php b/tests/ImageProcessing/Photo/PhotoStarTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
 
diff --git a/tests/ImageProcessing/Photo/PhotoTagsTest.php b/tests/ImageProcessing/Photo/PhotoTagsTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use Tests\Feature_v2\Base\BaseApiWithDataTest;
 
diff --git a/tests/ImageProcessing/Photo/PhotoZipUploadTest.php b/tests/ImageProcessing/Photo/PhotoZipUploadTest.php
@@ -16,7 +16,7 @@
  * @noinspection PhpUnhandledExceptionInspection
  */
 
-namespace Tests\Feature_v2\Photo;
+namespace Test\ImageProcessing\Photo;
 
 use App\Exceptions\ZipInvalidException;
 use function Safe\unlink;
