更新测试

Author: Yurunsoft

.travis.yml

@@ -1,7 +1,7 @@
-sudo: required
 language: php
+os: linux
 
-matrix:
+jobs:
   include:
   - php: '7.2'
     env: SWOOLE_VERSION="v4.5.2"
@@ -28,7 +28,7 @@ matrix:
   - php: nightly
 
 services:
-  - redis-server
+  - redis
 
 addons:
   apt:
@@ -46,22 +46,15 @@ install:
       cd ../;
     fi
   - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - wget https://github.com/swoole/swoole-src/archive/$SWOOLE_VERSION.tar.gz -O swoole.tar.gz && mkdir -p swoole && tar -xf swoole.tar.gz -C swoole --strip-components=1 && rm swoole.tar.gz && cd swoole && phpize && ./configure --enable-openssl --enable-http2 && make -j && make install && cd -
-  - echo "extension = swoole.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - wget https://github.com/swoole/swoole-src/archive/$SWOOLE_VERSION.tar.gz -O swoole.tar.gz && mkdir -p swoole && tar -xf swoole.tar.gz -C swoole --strip-components=1 && rm swoole.tar.gz && cd swoole && phpize && ./configure --enable-openssl --enable-http2 && make -j && make install && cd - && echo "extension = swoole.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 before_script:
   - if [[ $DISABLE_XDEBUG != false ]]; then
       phpenv config-rm xdebug.ini;
     fi
-  - curl -sSfL -o ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit https://phar.phpunit.de/phpunit-7.phar
-  - export TEST_PHPUNIT_PATH=~/.phpenv/versions/$(phpenv version-name)/bin/phpunit
-  - php ./.travis/composer-no-phpunit.php
   - composer update
   - php --ri swoole
 
 script:
   - ./tests/run
-
-after_failure:
-  - php ./.travis/output-server-log.php
 

.travis/composer-no-phpunit.php

@@ -8,7 +8,7 @@
     },
     "require-dev": {
         "yurunsoft/imi": "dev-dev",
-        "phpunit/phpunit": "^7",
+        "phpunit/phpunit": ">=7",
         "yurunsoft/ide-helper": "~1.0"
     },
     "autoload": {

composer.json

@@ -11,7 +11,6 @@
     <testsuites>
         <testsuite name="queue">
             <directory>Queue</directory>
-            <file>*.php</file>
         </testsuite>
     </testsuites>
 </phpunit>