Skip to content

Commit d1595b7

Browse files
clueclue
committed
Update test suite and report failed assertions
1 parent eaff8fe commit d1595b7

7 files changed

+100
-41
lines changed

‎.github/workflows/ci.yml

+51-24
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
PHPUnit:
99
name: PHPUnit (PHP ${{ matrix.php }})
10-
runs-on: ubuntu-18.04 # legacy Ubuntu 18.04 for legacy libevent
10+
runs-on: ubuntu-22.04
1111
strategy:
1212
matrix:
1313
php:
@@ -24,24 +24,46 @@ jobs:
2424
- 5.4
2525
- 5.3
2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v3
2828
- uses: shivammathur/setup-php@v2
2929
with:
3030
php-version: ${{ matrix.php }}
3131
coverage: xdebug
32-
- run: sudo apt-get update && sudo apt-get install libevent-dev
33-
- name: Install ext-event on PHP >= 5.4
34-
run: |
35-
echo "yes" | sudo pecl install event
36-
# explicitly enable extensions in php.ini on PHP 5.6+
37-
php -r 'exit((int)(PHP_VERSION_ID >= 50600));' || echo "extension=event.so" | sudo tee -a "$(php -r 'echo php_ini_loaded_file();')"
38-
if: ${{ matrix.php >= 5.4 }}
39-
- name: Install ext-ev on PHP >= 5.4
40-
run: |
41-
echo "yes" | sudo pecl install ev
42-
# explicitly enable extensions in php.ini on PHP 5.6+
43-
php -r 'exit((int)(PHP_VERSION_ID >= 50600));' || echo "extension=ev.so" | sudo tee -a "$(php -r 'echo php_ini_loaded_file();')"
44-
if: ${{ matrix.php >= 5.4 }}
32+
ini-file: development
33+
ini-values: disable_functions='' # do not disable PCNTL functions on PHP < 8.1
34+
extensions: sockets, pcntl ${{ matrix.php >= 5.6 && ', event' || '' }} ${{ matrix.php >= 5.4 && ', ev' || '' }}
35+
env:
36+
fail-fast: true # fail step if any extension can not be installed
37+
- run: composer install
38+
- run: vendor/bin/phpunit --coverage-text
39+
if: ${{ matrix.php >= 7.3 }}
40+
- run: vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy
41+
if: ${{ matrix.php < 7.3 }}
42+
43+
PHPUnit-Unstable:
44+
name: PHPUnit (Unstable PHP ${{ matrix.php }})
45+
runs-on: ubuntu-20.04
46+
continue-on-error: true
47+
strategy:
48+
matrix:
49+
php:
50+
- 7.4
51+
- 7.3
52+
- 7.2
53+
- 7.1
54+
- 7.0
55+
- 5.6
56+
- 5.5
57+
- 5.4
58+
- 5.3
59+
steps:
60+
- uses: actions/checkout@v3
61+
- uses: shivammathur/setup-php@v2
62+
with:
63+
php-version: ${{ matrix.php }}
64+
coverage: xdebug
65+
ini-file: development
66+
extensions: sockets, pcntl
4567
- name: Install ext-uv on PHP 7.x
4668
run: |
4769
sudo add-apt-repository ppa:ondrej/php -y && sudo apt-get update -q && sudo apt-get install libuv1-dev
@@ -50,6 +72,7 @@ jobs:
5072
if: ${{ matrix.php >= 7.0 && matrix.php < 8.0 }}
5173
- name: Install legacy ext-libevent on PHP < 7.0
5274
run: |
75+
sudo apt-get update && sudo apt-get install libevent-dev
5376
curl http://pecl.php.net/get/libevent-0.1.0.tgz | tar -xz
5477
pushd libevent-0.1.0
5578
phpize
@@ -78,7 +101,7 @@ jobs:
78101

79102
PHPUnit-Windows:
80103
name: PHPUnit (PHP ${{ matrix.php }} on Windows)
81-
runs-on: windows-2019
104+
runs-on: windows-2022
82105
continue-on-error: true
83106
strategy:
84107
matrix:
@@ -91,11 +114,12 @@ jobs:
91114
- 7.2
92115
- 7.1
93116
steps:
94-
- uses: actions/checkout@v2
117+
- uses: actions/checkout@v3
95118
- uses: shivammathur/setup-php@v2
96119
with:
97120
php-version: ${{ matrix.php }}
98121
coverage: xdebug
122+
ini-file: development
99123
extensions: sockets,event # future: add uv-beta (installs, but can not load)
100124
- run: composer install
101125
- run: vendor/bin/phpunit --coverage-text
@@ -105,13 +129,16 @@ jobs:
105129

106130
PHPUnit-hhvm:
107131
name: PHPUnit (HHVM)
108-
runs-on: ubuntu-18.04
132+
runs-on: ubuntu-22.04
109133
continue-on-error: true
110134
steps:
111-
- uses: actions/checkout@v2
112-
- uses: azjezz/setup-hhvm@v1
135+
- uses: actions/checkout@v3
136+
- run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
137+
- name: Run hhvm composer.phar install
138+
uses: docker://hhvm/hhvm:3.30-lts-latest
139+
with:
140+
args: hhvm composer.phar install
141+
- name: Run hhvm vendor/bin/phpunit
142+
uses: docker://hhvm/hhvm:3.30-lts-latest
113143
with:
114-
version: lts-3.30
115-
- run: composer self-update --2.2 # downgrade Composer for HHVM
116-
- run: hhvm $(which composer) install
117-
- run: hhvm vendor/bin/phpunit
144+
args: hhvm vendor/bin/phpunit

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EventLoop Component
1+
# EventLoop
22

33
[![CI status](https://github.com/reactphp/event-loop/actions/workflows/ci.yml/badge.svg)](https://github.com/reactphp/event-loop/actions)
44
[![installs on Packagist](https://img.shields.io/packagist/dt/react/event-loop?color=blue&label=installs%20on%20Packagist)](https://packagist.org/packages/react/event-loop)
@@ -10,7 +10,7 @@ same event loop. This component provides a common `LoopInterface` that any
1010
library can target. This allows them to be used in the same loop, with one
1111
single [`run()`](#run) call that is controlled by the user.
1212

13-
**Table of Contents**
13+
**Table of contents**
1414

1515
* [Quickstart example](#quickstart-example)
1616
* [Usage](#usage)
@@ -897,7 +897,7 @@ See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades.
897897
This project aims to run on any platform and thus does not require any PHP
898898
extensions and supports running on legacy PHP 5.3 through current PHP 8+ and
899899
HHVM.
900-
It's *highly recommended to use PHP 7+* for this project.
900+
It's *highly recommended to use the latest supported PHP version* for this project.
901901

902902
Installing any of the event loop extensions is suggested, but entirely optional.
903903
See also [event loop implementations](#loop-implementations) for more details.

‎composer.json

+4-6
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,19 @@
2929
"php": ">=5.3.0"
3030
},
3131
"require-dev": {
32-
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
32+
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
3333
},
3434
"suggest": {
35-
"ext-event": "~1.0 for ExtEventLoop",
36-
"ext-pcntl": "For signal handling support when using the StreamSelectLoop",
37-
"ext-uv": "* for ExtUvLoop"
35+
"ext-pcntl": "For signal handling support when using the StreamSelectLoop"
3836
},
3937
"autoload": {
4038
"psr-4": {
41-
"React\\EventLoop\\": "src"
39+
"React\\EventLoop\\": "src/"
4240
}
4341
},
4442
"autoload-dev": {
4543
"psr-4": {
46-
"React\\Tests\\EventLoop\\": "tests"
44+
"React\\Tests\\EventLoop\\": "tests/"
4745
}
4846
}
4947
}

‎phpunit.xml.dist

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
4-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
3+
<!-- PHPUnit configuration file with new format for PHPUnit 9.6+ -->
4+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
66
bootstrap="vendor/autoload.php"
77
cacheResult="false"
88
colors="true"
99
convertDeprecationsToExceptions="true">
1010
<testsuites>
11-
<testsuite name="React test suite">
11+
<testsuite name="EventLoop Test Suite">
1212
<directory>./tests/</directory>
1313
</testsuite>
1414
</testsuites>
@@ -17,4 +17,12 @@
1717
<directory>./src/</directory>
1818
</include>
1919
</coverage>
20+
<php>
21+
<ini name="error_reporting" value="-1" />
22+
<!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
23+
<!-- <ini name="zend.assertions" value="1" /> -->
24+
<ini name="assert.active" value="1" />
25+
<ini name="assert.exception" value="1" />
26+
<ini name="assert.bail" value="0" />
27+
</php>
2028
</phpunit>

‎phpunit.xml.legacy

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
3+
<!-- PHPUnit configuration file with old format for legacy PHPUnit -->
44
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
66
bootstrap="vendor/autoload.php"
77
colors="true">
88
<testsuites>
9-
<testsuite name="React test suite">
9+
<testsuite name="EventLoop Test Suite">
1010
<directory>./tests/</directory>
1111
</testsuite>
1212
</testsuites>
@@ -15,4 +15,12 @@
1515
<directory>./src/</directory>
1616
</whitelist>
1717
</filter>
18+
<php>
19+
<ini name="error_reporting" value="-1" />
20+
<!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
21+
<!-- <ini name="zend.assertions" value="1" /> -->
22+
<ini name="assert.active" value="1" />
23+
<ini name="assert.exception" value="1" />
24+
<ini name="assert.bail" value="0" />
25+
</php>
1826
</phpunit>

‎tests/AbstractLoopTest.php

+16-2
Original file line numberDiff line numberDiff line change
@@ -657,11 +657,13 @@ public function testRemoveSignalNotRegisteredIsNoOp()
657657

658658
/**
659659
* @requires extension pcntl
660+
* @requires function posix_kill()
661+
* @requires function posix_getpid()
660662
*/
661663
public function testSignal()
662664
{
663-
if (!function_exists('posix_kill') || !function_exists('posix_getpid')) {
664-
$this->markTestSkipped('Signal test skipped because functions "posix_kill" and "posix_getpid" are missing.');
665+
if ($this->loop instanceof StreamSelectLoop && !(\function_exists('pcntl_signal') && \function_exists('pcntl_signal_dispatch'))) {
666+
$this->markTestSkipped('Signal handling with StreamSelectLoop requires pcntl_signal() and pcntl_signal_dispatch(), see also disable_functions');
665667
}
666668

667669
$called = false;
@@ -696,6 +698,10 @@ public function testSignal()
696698
*/
697699
public function testSignalMultipleUsagesForTheSameListener()
698700
{
701+
if ($this->loop instanceof StreamSelectLoop && !(\function_exists('pcntl_signal') && \function_exists('pcntl_signal_dispatch'))) {
702+
$this->markTestSkipped('Signal handling with StreamSelectLoop requires pcntl_signal() and pcntl_signal_dispatch(), see also disable_functions');
703+
}
704+
699705
$funcCallCount = 0;
700706
$func = function () use (&$funcCallCount) {
701707
$funcCallCount++;
@@ -723,6 +729,10 @@ public function testSignalMultipleUsagesForTheSameListener()
723729
*/
724730
public function testSignalsKeepTheLoopRunning()
725731
{
732+
if ($this->loop instanceof StreamSelectLoop && !(\function_exists('pcntl_signal') && \function_exists('pcntl_signal_dispatch'))) {
733+
$this->markTestSkipped('Signal handling with StreamSelectLoop requires pcntl_signal() and pcntl_signal_dispatch(), see also disable_functions');
734+
}
735+
726736
$loop = $this->loop;
727737
$function = function () {};
728738
$this->loop->addSignal(SIGUSR1, $function);
@@ -739,6 +749,10 @@ public function testSignalsKeepTheLoopRunning()
739749
*/
740750
public function testSignalsKeepTheLoopRunningAndRemovingItStopsTheLoop()
741751
{
752+
if ($this->loop instanceof StreamSelectLoop && !(\function_exists('pcntl_signal') && \function_exists('pcntl_signal_dispatch'))) {
753+
$this->markTestSkipped('Signal handling with StreamSelectLoop requires pcntl_signal() and pcntl_signal_dispatch(), see also disable_functions');
754+
}
755+
742756
$loop = $this->loop;
743757
$function = function () {};
744758
$this->loop->addSignal(SIGUSR1, $function);

‎tests/StreamSelectLoopTest.php

+4
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ public function signalProvider()
132132
* Test signal interrupt when no stream is attached to the loop
133133
* @dataProvider signalProvider
134134
* @requires extension pcntl
135+
* @requires function pcntl_signal()
136+
* @requires function pcntl_signal_dispatch()
135137
*/
136138
public function testSignalInterruptNoStream($signal)
137139
{
@@ -160,6 +162,8 @@ public function testSignalInterruptNoStream($signal)
160162
* Test signal interrupt when a stream is attached to the loop
161163
* @dataProvider signalProvider
162164
* @requires extension pcntl
165+
* @requires function pcntl_signal()
166+
* @requires function pcntl_signal_dispatch()
163167
*/
164168
public function testSignalInterruptWithStream($signal)
165169
{

0 commit comments

Comments
 (0)