makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17176] Ensure slow tests are not run when not selected

Browse source 
PHPBB3-17176
This commit is contained in:
Marc Alexander 2023-09-09 12:27:52 +02:00
parent 1f9d14357c
commit 3e2628fb73
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/tests.yml vendored
View file

@ -125,12 +125,12 @@ jobs:
- php: '8.1' - php: '8.1'
db: "mysql:5.7" db: "mysql:5.7"
db_alias: "MySQL Slow Tests" db_alias: "MySQL Slow Tests"
type: 'unit' type: 'slow'
SLOWTESTS: 1 SLOWTESTS: 1
- php: '8.1' - php: '8.1'
db: "mysql:5.7" db: "mysql:5.7"
db_alias: "MyISAM Tests" db_alias: "MyISAM Tests"
type: 'functional' type: 'MyISAM'
MYISAM: 1 MYISAM: 1
name: ${{ matrix.type }} - PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} name: ${{ matrix.type }} - PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
@ -225,7 +225,7 @@ jobs:
DB: ${{steps.database-type.outputs.db}} DB: ${{steps.database-type.outputs.db}}
if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 && matrix.type == 'unit' }} if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 && matrix.type == 'unit' }}
run: | run: |
phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error --exclude-group functional phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error --exclude-group functional,slow
- name: Run functional tests - name: Run functional tests
env: env:
@ -566,7 +566,7 @@ jobs:
- name: Run unit tests - name: Run unit tests
if: ${{ matrix.type == 'unit' }} if: ${{ matrix.type == 'unit' }}
run: | run: |
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 --exclude-group functional,slow
- name: Run functional tests - name: Run functional tests
if: ${{ matrix.type == 'functional' }} if: ${{ matrix.type == 'functional' }}
run: | run: |

2
phpBB/phpbb/auth/provider/ldap.php
View file

@ -201,7 +201,7 @@ class ldap extends base
1 1
); );
$ldap_result = @ldap_get_entries($ldap, $search); $ldap_result = $search !== false ? @ldap_get_entries($ldap, $search) : [];
if (is_array($ldap_result) && count($ldap_result) > 1) if (is_array($ldap_result) && count($ldap_result) > 1)
{ {