From d4cb357b2634550deac9d0d88a6f793da0fcaf5c Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 17 Oct 2021 13:22:46 +0700
Subject: [PATCH] [ticket/16889] Run functional tests separately

PHPBB3-16889
---
 .github/workflows/tests.yml             | 7 ++++---
 tests/functional/extension_acp_test.php | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c4c91e0c2f..580a424915 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,6 +6,7 @@ on:
             - 3.3.x
             - master
             - 'prep-release-*'
+            - 'ticket/*'
         tags:
             - 'release-*'
     pull_request:
@@ -530,9 +531,8 @@ jobs:
               run: |
                   $postgreSqlSvc = Get-Service "postgresql*"
                   Set-Service $postgreSqlSvc.Name -StartupType manual
-                  $postgreSqlSvc.Start()
                   try {
-                    (Get-Service "postgresql*").Start()
+                    $postgreSqlSvc.Start()
                   } catch  {
                     $_ | select *
                   }
@@ -545,4 +545,5 @@ jobs:
                   New-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows Defender" -Name DisableAntiSpyware -Value 1 -PropertyType DWORD -Force
             - name: Run unit tests
               run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error
+                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --exclude-group functional
+                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --group functional
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 94ed7a35b7..2f26c53ce5 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -43,8 +43,6 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 
 		$this->purge_cache();
 
-		$this->get_db();
-
 		// Clear the phpbb_ext table
 		$this->db->sql_query('DELETE FROM phpbb_ext');