Test package with PostgreSQL

Author: marickvantuil

.github/workflows/run-tests.yml

@@ -11,6 +11,7 @@ jobs:
 
     strategy:
       matrix:
+        db: ['mysql', 'pgsql']
         payload:
           - { queue: 'github-actions-laravel9-php81', laravel: '9.*', php: '8.1', 'testbench': '7.*'}
           - { queue: 'github-actions-laravel9-php80', laravel: '9.*', php: '8.0', 'testbench': '7.*'}
@@ -22,7 +23,7 @@ jobs:
           - { queue: 'github-actions-laravel6-php80', laravel: '6.*', php: '8.0', 'testbench': '4.*' }
           - { queue: 'github-actions-laravel6-php74', laravel: '6.*', php: '7.4', 'testbench': '4.*' }
 
-    name: PHP ${{ matrix.payload.php }} - Laravel ${{ matrix.payload.laravel }}
+    name: PHP ${{ matrix.payload.php }} - Laravel ${{ matrix.payload.laravel }} - DB ${{ matrix.db }}
 
     steps:
       - name: Checkout code
@@ -35,23 +36,24 @@ jobs:
           extensions: mbstring, dom, fileinfo
           coverage: none
 
-      - name: Set up MySQL
+      - name: Set up MySQL and PostgreSQL
         run: |
-          sudo /etc/init.d/mysql start
-          mysql -e 'CREATE DATABASE test;' -uroot -proot
-
+          MYSQL_PORT=3307 POSTGRES_PORT=5432 docker compose up ${{ matrix.db }} -d
       - name: Install dependencies
         run: |
           composer require "laravel/framework:${{ matrix.payload.laravel }}" "orchestra/testbench:${{ matrix.payload.testbench }}" --no-interaction --no-update
           composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
+          if [ "${{ matrix.db }}" = "mysql" ]; then
+            while ! mysqladmin ping --host=127.0.0.1 --user=cloudtasks --port=3307 --password=cloudtasks --silent; do
+              echo "Waiting for MySQL..."
+              sleep 1
+            done
+          else
+            echo "Not waiting for MySQL."
+          fi
       - name: Execute tests
         env:
-          CI_DB_DRIVER: mysql
-          CI_DB_HOST: 127.0.0.1
-          CI_DB_PORT: 3306
-          CI_DB_DATABASE: test
-          CI_DB_USERNAME: root
-          CI_DB_PASSWORD: root
+          DB_DRIVER: ${{ matrix.db }}
           CI_CLOUD_TASKS_PROJECT_ID: ${{ secrets.CI_CLOUD_TASKS_PROJECT_ID }}
           CI_CLOUD_TASKS_QUEUE: ${{ secrets.CI_CLOUD_TASKS_QUEUE }}
           CI_CLOUD_TASKS_LOCATION: ${{ secrets.CI_CLOUD_TASKS_LOCATION }}

docker-compose.yml

@@ -2,14 +2,17 @@ services:
   mysql:
     image: mysql:8
     ports:
-      - 3306:3306
+      - '${MYSQL_PORT:-3307}:3306'
     environment:
-      MYSQL_ROOT_PASSWORD: 'my-secret-pw'
+      MYSQL_USER: 'cloudtasks'
+      MYSQL_PASSWORD: 'cloudtasks'
       MYSQL_DATABASE: 'cloudtasks'
-  postgres:
+      MYSQL_ROOT_PASSWORD: 'root'
+  pgsql:
     image: postgres:14
     ports:
-      - 5432:5432
+      - '${POSTGRES_PORT:-5432}:5432'
     environment:
-      POSTGRES_PASSWORD: 'my-secret-pw'
+      POSTGRES_USER: 'cloudtasks'
+      POSTGRES_PASSWORD: 'cloudtasks'
       POSTGRES_DB: 'cloudtasks'

phpunit.xml

@@ -24,11 +24,6 @@
         <env name="MAIL_DRIVER" value="log"/>
         <env name="GOOGLE_APPLICATION_CREDENTIALS" value="./tests/Support/gcloud-key-valid.json" />
         <env name="QUEUE_DRIVER" value="cloudtasks"/>
-        <env name="DB_CONNECTION" value="mysql" />
-        <env name="DB_HOST" value="127.0.0.1" />
-        <env name="DB_PORT" value="3306" />
-        <env name="DB_USERNAME" value="root" />
-        <env name="DB_PASSWORD" value="my-secret-pw" />
-        <env name="DB_DATABASE" value="cloudtasks" />
+        <env name="DB_DRIVER" value="mysql" />
     </php>
 </phpunit>

setup-test-env.php

@@ -88,7 +88,7 @@ public function test_create_task()
 
         // Assert
         $this->assertMatchesRegularExpression(
-            '/projects\/' . env('CI_CLOUD_TASKS_PROJECT_ID') . '\/locations\/' . env('CI_CLOUD_TASKS_LOCATION') . '\/queues\/' . env('CI_CLOUD_TASKS_QUEUE') . '\/tasks\/\d{19,}$/',
+            '/projects\/' . env('CI_CLOUD_TASKS_PROJECT_ID') . '\/locations\/' . env('CI_CLOUD_TASKS_LOCATION') . '\/queues\/' . env('CI_CLOUD_TASKS_QUEUE') . '\/tasks\/\d+$/',
             $taskName
         );
     }

tests/CloudTasksApiTest.php

@@ -241,7 +241,7 @@ public function test_max_attempts_in_combination_with_retry_until()
                 ->setMaxAttempts(3)
                 ->setMaxRetryDuration(new Duration(['seconds' => 3]))
         );
-        CloudTasksApi::partialMock()->shouldReceive('getRetryUntilTimestamp')->andReturn(time() + 1)->byDefault();
+        CloudTasksApi::partialMock()->shouldReceive('getRetryUntilTimestamp')->andReturn(time() + 10)->byDefault();
 
         $job = $this->dispatch(new FailingJob());
 

tests/TaskHandlerTest.php

@@ -66,13 +66,14 @@ protected function getEnvironmentSetUp($app)
         }
 
         $app['config']->set('database.default', 'testbench');
+        $port = env('DB_DRIVER') === 'mysql' ? 3307 : 5432;
         $app['config']->set('database.connections.testbench', [
-            'driver'   => 'mysql',
-            'host' => env('CI_DB_HOST', env('DB_HOST')),
-            'port' => env('CI_DB_PORT', env('DB_PORT')),
-            'database' => env('CI_DB_DATABASE', env('DB_DATABASE')),
-            'username' => env('CI_DB_USERNAME', env('DB_USERNAME')),
-            'password' => env('CI_DB_PASSWORD', env('DB_PASSWORD')),
+            'driver'   => env('DB_DRIVER', 'mysql'),
+            'host' => '127.0.0.1',
+            'port' => $port,
+            'database' => 'cloudtasks',
+            'username' => 'cloudtasks',
+            'password' => 'cloudtasks',
             'prefix'   => '',
         ]);