diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..1da8ce1 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,61 @@ +name: PHPUnit for motan-php +on: + push: + branches: + - master + - dev + pull_request: + branches: + - master + - dev +jobs: + testing: + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + operating-system: [ubuntu-latest] + php-versions: [7.2, 7.3, 7.4] + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Install php + uses: shivammathur/setup-php@v2 + env: + runner: self-hosted + with: + php-version: ${{ matrix.php-versions }} + + - name: Install dependencies + run: composer install --ignore-platform-reqs + + - name: Run tests + run: composer test + + codecov: + runs-on: ubuntu-latest + steps: + - name: Set php + uses: shivammathur/setup-php@v2 + env: + runner: self-hosted + with: + php-version: 7.4 + coverage: pcov + + - name: Checkout code + uses: actions/checkout@v2 + + - name: Install dependencies + run: composer install --ignore-platform-reqs + + - name: Generate coverage report + run: composer test-coverage + + - name: Uplaod coverage report + uses: codecov/codecov-action@v2.1.0 + with: + token: "fe6d871b-9785-470b-9c3d-eb1669fcb2ef" + file: ./tests/coverage/clover.xml + flags: unittests + name: codecov-umbrella \ No newline at end of file diff --git a/.gitignore b/.gitignore index 303f719..8de10f1 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ core.* pretty/zj tests/coverage/ zjtest_* +.phpunit.result.cache # weibo-mesh ./agent_runtime @@ -34,4 +35,5 @@ weibo-mesh-runpath/* agent.pid # debugger -.gdb* \ No newline at end of file +.gdb* +/tests/MockServer/log.txt diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9fd119b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,48 +0,0 @@ -sudo: required -dist: xenial -language: php - -services: - - docker - -env: - global: - - MESH_UP=yes - - MEHS_RUN_PATH=$(pwd)/weibo-mesh-runpath - - MESH_CONTAINER_NAME=mesh-testhelpe - -matrix: - fast_finish: true - include: - - php: 5.6 - - php: 5.6 - env: MESH_UP=no - - php: 7.1 - - php: 7.1 - env: MESH_UP=no - - php: 7.3 - - php: 7.3 - env: MESH_UP=no - -cache: - directories: - - $HOME/.composer/cache - -before_install: - - travis_retry composer self-update - - sudo apt-get install -y iproute2 - - sudo cp /sbin/tc /usr/sbin/tc - -install: - - travis_retry composer update --prefer-dist --no-interaction --prefer-stable --no-suggest - -script: - - ./run.sh ci - -after_success: - - bash <(curl -s https://codecov.io/bash) - -notifications: - email: - on_success: change - on_failure: always diff --git a/README.md b/README.md index a197217..780cc33 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Motan-PHP [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/weibocom/motan/blob/master/LICENSE) -[![https://travis-ci.org/weibocom/motan-php.svg?branch=master](https://travis-ci.org/weibocom/motan-php.svg?branch=master)](https://travis-ci.org/weibocom/motan-php) +[![codecov](https://codecov.io/gh/weibocom/motan-php/branch/master/graph/badge.svg)](https://codecov.io/gh/weibocom/motan-php) +[![PHPUnit for motan-php](https://github.com/weibocom/motan-php/workflows/PHPUnit%20for%20motan-php/badge.svg)](https://github.com/weibocom/motan-php/actions) # Overview [Motan][motan] is a cross-language remote procedure call(RPC) framework for rapid development of high performance distributed services. @@ -83,17 +84,45 @@ try{ } ``` +# Unit Test + +If you use the local php environment to run unit tests, please make sure that your php version is between 7.2 and 7.4, supports functions such as pcntl_fork, posix_kill, pcntl_signal, etc., and downloaded the composer component. +You can run unit tests by following the instructions below。 +```shell +git clone https://github.com/weibocom/motan-php.git +cd motan-php +git checkout $(test branch) +composer install +composer test # just run phpunit +composer test-coverage # run phpunit and generate report +``` + +If you do not want to install a php-related environment, it is recommended that you use docker to avoid problems with inconsistent environments. +You can follow the instructions below. +```shell +git clone https://github.com/weibocom/motan-php.git +cd motan-php +git checkout $(test branch) +docker run --rm -it -v $PWD:/mnt --entrypoint="" snail007/php:7.4 bash +cd /mnt +composer install +composer test # just run phpunit +composer test-coverage # run phpunit and generate report +``` + # Contributors * 周晶([@idevz](https://github.com/idevz)) -* 罗明刚[@lion2luo](https://github.com/lion2luo) +* 罗明刚([@lion2luo](https://github.com/lion2luo)) * 郭万韬 * 丁振凯 +* 李枨煊([@flyhope](https://github.com/flyhope)) +* 吴桦([@cocowh](https://github.com/cocowh)) # License Motan is released under the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0). [motan]:https://github.com/weibocom/motan -[testhelper]:https://github.com/weibo-mesh/testhelpers -[phpts]:https://github.com/weibocom/motan-php/tree/master/phpts/Motan_MClient \ No newline at end of file + +Welcome to submit issue and contribute code！ \ No newline at end of file diff --git a/composer.json b/composer.json index 6ca7cce..6be6ef8 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "motan/motan-php", - "version": "v1.1.8", + "version": "v1.1.9", "description": "Motan For PHP", "autoload": { "psr-4": { @@ -10,16 +10,14 @@ "bin": [ "weibo-protoc-gen-php.php" ], - "repositories": { - "packagist": { - "type": "composer", - "url": "https://packagist.phpcomposer.com" - } - }, "require-dev": { - "phpunit/phpunit": "5.7" + "phpunit/phpunit": "^8.0" }, "require": { "wei-breeze/breeze": "v0.1.0" + }, + "scripts": { + "test": "phpunit --testdox tests", + "test-coverage": "phpunit --testdox tests --coverage-html tests/coverage --coverage-clover tests/coverage/clover.xml" } -} +} \ No newline at end of file diff --git a/phpts/Motan_Client/__call_basic.phpt b/phpts/Motan_Client/__call_basic.phpt deleted file mode 100644 index f63a372..0000000 --- a/phpts/Motan_Client/__call_basic.phpt +++ /dev/null @@ -1,32 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -setConnectionTimeOut(50000); -$url->setReadTimeOut(50000); -$cx = new \Motan\Client($url); -$params = [ - 'hello'=>'motan-php', - 'a'=>'b' -]; -$rs = $cx->Hello($params); -var_dump($rs); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(26) "[]-------[128 1 2 128 1 2]" -===DONE=== diff --git a/phpts/Motan_Client/doCall_basic.phpt b/phpts/Motan_Client/doCall_basic.phpt deleted file mode 100644 index 045d65b..0000000 --- a/phpts/Motan_Client/doCall_basic.phpt +++ /dev/null @@ -1,29 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -setConnectionTimeOut(50000); -$url->setReadTimeOut(50000); -$cx = new \Motan\Client($url); -$rs = $cx->doCall('HelloX', 'string', 123, 124, ['string','arr']); - -var_dump($rs); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(46) "strArg:string-inT64:123-int32:124-[string arr]" -===DONE=== diff --git a/phpts/Motan_Client/doCall_cacheService_basic.phpt b/phpts/Motan_Client/doCall_cacheService_basic.phpt deleted file mode 100644 index 158590f..0000000 --- a/phpts/Motan_Client/doCall_cacheService_basic.phpt +++ /dev/null @@ -1,33 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() cacheService by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -setConnectionTimeOut(50000); -$url->setReadTimeOut(50000); -$url->addHeaders(["CS_ns" => "test_cacheservice_namespace"]); -$url->setProtocol('memcache'); -$cx = new \Motan\Client($url); -$rs = $cx->doCall("set", "test123456", "你好，世界,123172397129371927391729837129", 104600); -if (!empty($cx->getResponseException())) { - var_dump($cx->getResponseException()); -} -var_dump($cx->doCall("get", "test123456")); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(46) "你好，世界,123172397129371927391729837129" -===DONE=== diff --git a/phpts/Motan_Client/doCall_multi_args_basic.phpt b/phpts/Motan_Client/doCall_multi_args_basic.phpt deleted file mode 100644 index 34f6edb..0000000 --- a/phpts/Motan_Client/doCall_multi_args_basic.phpt +++ /dev/null @@ -1,28 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -setConnectionTimeOut(50000); -$url->setReadTimeOut(50000); -$cx = new \Motan\Client($url); -$rs = $cx->doCall('HelloX', '222', 123, 124, ['string','arr']); -var_dump($rs); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(43) "strArg:222-inT64:123-int32:124-[string arr]" -===DONE=== diff --git a/phpts/Motan_Client/getEndPoint_basic.phpt b/phpts/Motan_Client/getEndPoint_basic.phpt deleted file mode 100644 index be09b6e..0000000 --- a/phpts/Motan_Client/getEndPoint_basic.phpt +++ /dev/null @@ -1,31 +0,0 @@ ---TEST-- -Test class Motan\Client method getEndPoint() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -getProtocol() ); - - - -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(6) "motan2" -===DONE=== diff --git a/phpts/Motan_Client/getResponseException_basic.phpt b/phpts/Motan_Client/getResponseException_basic.phpt deleted file mode 100644 index cbf397a..0000000 --- a/phpts/Motan_Client/getResponseException_basic.phpt +++ /dev/null @@ -1,30 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -setConnectionTimeOut(50000); -$url->setReadTimeOut(50000); -$cx = new \Motan\Client($url); -$rs = $cx->doCall('HelloX', 222, 123, 124, ['string','arr']); -if (null === $rs) { - var_dump($cx->getResponseException()); -} -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(99) "{"errcode":500,"errmsg":"FailOverHA call fail 1 times. Exception: provider call panic","errtype":1}" -===DONE=== diff --git a/phpts/Motan_Client/httpServer_basic.phpt b/phpts/Motan_Client/httpServer_basic.phpt deleted file mode 100644 index 5e06963..0000000 --- a/phpts/Motan_Client/httpServer_basic.phpt +++ /dev/null @@ -1,55 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -anyFuncName(); -} catch(Exception $e) { - var_dump($e->getMessage()); -} -var_dump($motan2_res); - - -$cedrus_url = 'cedrus://127.0.0.1:9981/?service=com.weibo.HelloWorldService&group=motan-demo-rpc'; -$cedrus_cx = new Motan\Client( new Motan\URL($cedrus_url) ); -try{ - $cedrus_res = $cedrus_cx->get(); -} catch(Exception $e) { - var_dump($e->getMessage()); -} -var_dump($cedrus_res); - - -$http_url = 'http://127.0.0.1:9981/?service=com.weibo.HelloWorldService&group=motan-demo-rpc'; -$http_cx = new Motan\Client( new Motan\URL($http_url) ); -try{ - $http_res = $http_cx->get(); -} catch(Exception $e) { - var_dump($e->getMessage()); -} -var_dump($http_res); - -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(31) "http server provider by golang." -string(31) "http server provider by golang." -string(31) "http server provider by golang." -===DONE=== \ No newline at end of file diff --git a/phpts/Motan_Client/multiCall_basic.phpt b/phpts/Motan_Client/multiCall_basic.phpt deleted file mode 100644 index 2449dae..0000000 --- a/phpts/Motan_Client/multiCall_basic.phpt +++ /dev/null @@ -1,34 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -multiCall([$url1, $url2]); - -var_dump($rs); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -array(2) { - [0]=> - string(26) "[]-------[128 1 2 128 1 2]" - [1]=> - string(6) "HelloW" -} -===DONE=== diff --git a/phpts/Motan_MClient/__call_basic.phpt b/phpts/Motan_MClient/__call_basic.phpt deleted file mode 100644 index bf00a30..0000000 --- a/phpts/Motan_MClient/__call_basic.phpt +++ /dev/null @@ -1,32 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -'motan-php', - 'a'=>'b' -]; -$request = new \Motan\Request(DEFAULT_SERVICE, 'Hello', $params); -$request->setGroup(DEFAULT_GROUP); -$rs = $cx->doCall($request); -var_dump($rs); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(26) "[]-------[128 1 2 128 1 2]" -===DONE=== diff --git a/phpts/Motan_MClient/connectionTimeout_exception_basic.phpt b/phpts/Motan_MClient/connectionTimeout_exception_basic.phpt deleted file mode 100644 index 27ba765..0000000 --- a/phpts/Motan_MClient/connectionTimeout_exception_basic.phpt +++ /dev/null @@ -1,48 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- - 1000, -]; -exec('ls /sys/class/net', $net_devices); -foreach($net_devices as $net_dvc) { - $delay_time = isset($net_devices_time_delay[$net_dvc]) ? $net_devices_time_delay[$net_dvc] : 10; - exec("tc qdisc add dev ${net_dvc} root netem delay ${delay_time}ms"); -} - -$app_name = 'phpt-test-MClient'; -$group = DEFAULT_GROUP; -$service = DEFAULT_SERVICE; -$protocol = DEFAULT_PROTOCOL; -define('D_CONN_DEBUG', '8.8.8.8:53'); -define('WEIBOMESH_CONN_TIME_OUT', 0.0005); -define('WEIBOMESH_CONN_RETRY_TIMES', 1); -$cx = new Motan\MClient( $app_name ); -$cx->setRequestTimeOut(0.000001); -$request = new \Motan\Request($service, 'HelloW', ['test'=>'time_out']); -$request->setGroup(DEFAULT_GROUP); -try{ - $cx->doCall($request); -} catch(Exception $e) { - var_dump($e->getMessage()); -} - -foreach($net_devices as $net_dvc) { - exec("tc qdisc del dev ${net_dvc} root"); -} -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -weibo-mesh isn't alive Connect to 127.0.0.1:9981 fail, err_code:110,err_msg:Connection timed out -string(70) "Connect to 8.8.8.8:53 fail, err_code:110,err_msg:Connection timed out " -===DONE=== \ No newline at end of file diff --git a/phpts/Motan_MClient/doCall_basic.phpt b/phpts/Motan_MClient/doCall_basic.phpt deleted file mode 100644 index 60e189f..0000000 --- a/phpts/Motan_MClient/doCall_basic.phpt +++ /dev/null @@ -1,29 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -setGroup(DEFAULT_GROUP); -$rs = $cx->doCall($request); - -var_dump($rs); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(46) "strArg:string-inT64:123-int32:124-[string arr]" -===DONE=== diff --git a/phpts/Motan_MClient/doCall_cacheService_basic.phpt b/phpts/Motan_MClient/doCall_cacheService_basic.phpt deleted file mode 100644 index be17387..0000000 --- a/phpts/Motan_MClient/doCall_cacheService_basic.phpt +++ /dev/null @@ -1,37 +0,0 @@ ---TEST-- -Test class Motan\MClient parent method doCall() by calling it with its expected arguments - ---FILE-- -setGroup(DEFAULT_GROUP); -$set_request->setProtocol($protocol); -$rs = $cx->doCall($set_request); - -if (!empty($cx->getResponseException())) { - var_dump($cx->getResponseException()); -} - -$get_request = new \Motan\Request($service, 'get', "test123456"); -$get_request->setGroup(DEFAULT_GROUP); -$get_request->setProtocol($protocol); -var_dump($cx->doCall($get_request)); - -if (!empty($cx->getResponseException())) { - var_dump($cx->getResponseException()); -} -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(46) "你好，世界,123172397129371927391729837129" -===DONE=== diff --git a/phpts/Motan_MClient/doCall_multi_args_basic.phpt b/phpts/Motan_MClient/doCall_multi_args_basic.phpt deleted file mode 100644 index 60e189f..0000000 --- a/phpts/Motan_MClient/doCall_multi_args_basic.phpt +++ /dev/null @@ -1,29 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -setGroup(DEFAULT_GROUP); -$rs = $cx->doCall($request); - -var_dump($rs); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(46) "strArg:string-inT64:123-int32:124-[string arr]" -===DONE=== diff --git a/phpts/Motan_MClient/doMultiCall_basic.phpt b/phpts/Motan_MClient/doMultiCall_basic.phpt deleted file mode 100644 index 0b18caf..0000000 --- a/phpts/Motan_MClient/doMultiCall_basic.phpt +++ /dev/null @@ -1,30 +0,0 @@ ---TEST-- -Test class Motan\MClient method getMRs() by calling it with its expected arguments - ---FILE-- - 'b']); -$req2 = new \Motan\Request($service, 'Hello', ['xx' => 'wwww']); -$req3 = new \Motan\Request($service, 'HelloX', 33, 123,124,['string','arr']); -// $req3 = new \Motan\Request($service, 'HelloX', 'string', 123,124,['string','arr']); -$req1->setGroup(DEFAULT_GROUP); -$req2->setGroup(DEFAULT_GROUP); -$req3->setGroup(DEFAULT_GROUP); -$rs = $cx->doMultiCall([ - $req1, $req2, $req3 -]); -var_dump($rs->getException($req3)); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(99) "{"errcode":500,"errmsg":"FailOverHA call fail 1 times. Exception: provider call panic","errtype":1}" -===DONE=== diff --git a/phpts/Motan_MClient/doMultiCall_exception.phpt b/phpts/Motan_MClient/doMultiCall_exception.phpt deleted file mode 100644 index c4e7567..0000000 --- a/phpts/Motan_MClient/doMultiCall_exception.phpt +++ /dev/null @@ -1,34 +0,0 @@ ---TEST-- -Test class Motan\MClient method getMRs() by calling it with its expected arguments - ---FILE-- -setRequestTimeOut(0.01); -$req1 = new \Motan\Request($service, 'Hello', ['a' => 'b']); -$req2 = new \Motan\Request($service, 'Hello', ['xx' => 'wwww']); -$req3 = new \Motan\Request($service, 'TimeOutErr', ['test' => 'wwww']); -$req1->setGroup(DEFAULT_GROUP); -$req2->setGroup(DEFAULT_GROUP); -$req3->setGroup(DEFAULT_GROUP); -$multi_res = $cx->doMultiCall([ - $req1, $req2, $req3 -]); -var_dump($multi_res->getException($req3)); -if($multi_res->getException($req1) == NULL) { - var_dump($multi_res->getRs($req1)); -} -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(20) "Read header timeout." -string(26) "[]-------[128 1 2 128 1 2]" -===DONE=== diff --git a/phpts/Motan_MClient/getMRs_basic.phpt b/phpts/Motan_MClient/getMRs_basic.phpt deleted file mode 100644 index 1264455..0000000 --- a/phpts/Motan_MClient/getMRs_basic.phpt +++ /dev/null @@ -1,24 +0,0 @@ ---TEST-- -Test class Motan\MClient method getMRs() by calling it with its expected arguments - ---FILE-- -'b']); -$request->setGroup(DEFAULT_GROUP); -$multi_res = $cx->doMultiCall([$request]); - -var_dump( $multi_res->getRs( $request ) ); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(26) "[]-------[128 1 2 128 1 2]" -===DONE=== diff --git a/phpts/Motan_MClient/getResponseException_basic.phpt b/phpts/Motan_MClient/getResponseException_basic.phpt deleted file mode 100644 index c647ea2..0000000 --- a/phpts/Motan_MClient/getResponseException_basic.phpt +++ /dev/null @@ -1,29 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -setGroup(DEFAULT_GROUP); -$rs = $cx->doCall($request); -if (null === $rs) { - var_dump($cx->getResponseException()); -} -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(99) "{"errcode":500,"errmsg":"FailOverHA call fail 1 times. Exception: provider call panic","errtype":1}" -===DONE=== diff --git a/phpts/Motan_MClient/multiCall_basic.phpt b/phpts/Motan_MClient/multiCall_basic.phpt deleted file mode 100644 index 6cf2257..0000000 --- a/phpts/Motan_MClient/multiCall_basic.phpt +++ /dev/null @@ -1,37 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -multiCall([$url1, $url2]); - -var_dump($rs); -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -array(2) { - [0]=> - string(26) "[]-------[128 1 2 128 1 2]" - [1]=> - string(6) "HelloW" -} -===DONE=== diff --git a/phpts/Motan_MClient/requestTimeout_exception_basic.phpt b/phpts/Motan_MClient/requestTimeout_exception_basic.phpt deleted file mode 100644 index 0b6160e..0000000 --- a/phpts/Motan_MClient/requestTimeout_exception_basic.phpt +++ /dev/null @@ -1,33 +0,0 @@ ---TEST-- -Test class Motan\Client method doCall() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -setRequestTimeOut(0.000001); -$request = new \Motan\Request($service, 'HelloW', ['test'=>'time_out']); -$request->setGroup(DEFAULT_GROUP); -try{ - $cx->doCall($request); -} catch(Exception $e) { - var_dump($e->getMessage()); -} -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(20) "Read header timeout." -===DONE=== - diff --git a/phpts/Motan_URL/getHeaders_basic.phpt b/phpts/Motan_URL/getHeaders_basic.phpt deleted file mode 100644 index 600ec9e..0000000 --- a/phpts/Motan_URL/getHeaders_basic.phpt +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -Test class Motan\URL method getHeaders() by calling it with its expected arguments ---INI-- - ---FILE-- -getHeaders()); - -?> -===DONE=== ---EXPECTF-- -array(1) { - ["Content-Type"]=> - string(33) "application/x-www-form-urlencoded" -} -===DONE=== diff --git a/phpts/Motan_URL/getMethod_basic.phpt b/phpts/Motan_URL/getMethod_basic.phpt deleted file mode 100644 index c396449..0000000 --- a/phpts/Motan_URL/getMethod_basic.phpt +++ /dev/null @@ -1,24 +0,0 @@ ---TEST-- -Test class Motan\URL method getMethod() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -getMethod( ) ); - - - -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -string(4) "/add" -===DONE=== diff --git a/phpts/Motan_URL/getParams_basic.phpt b/phpts/Motan_URL/getParams_basic.phpt deleted file mode 100644 index 8fd8cb0..0000000 --- a/phpts/Motan_URL/getParams_basic.phpt +++ /dev/null @@ -1,18 +0,0 @@ ---TEST-- -Test class Motan\URL method getParams() by calling it with its expected arguments ---FILE-- -getParams( ) ); - - - -?> -===DONE=== ---EXPECTF-- -array(1) { - ["g"]=> - string(1) "x" -} -===DONE=== diff --git a/phpts/Motan_URL/getRawUrl_basic.phpt b/phpts/Motan_URL/getRawUrl_basic.phpt deleted file mode 100644 index 67afa39..0000000 --- a/phpts/Motan_URL/getRawUrl_basic.phpt +++ /dev/null @@ -1,10 +0,0 @@ ---TEST-- -Test class Motan\URL method getRawUrl() by calling it with its expected arguments ---FILE-- -getRawUrl() ); -?> ---EXPECTF-- -string(27) "http://weibo.com:90/add?g=x" diff --git a/phpts/Motan_URL/getService_basic.phpt b/phpts/Motan_URL/getService_basic.phpt deleted file mode 100644 index 5f78f6a..0000000 --- a/phpts/Motan_URL/getService_basic.phpt +++ /dev/null @@ -1,22 +0,0 @@ ---TEST-- -Test class Motan\URL method getService() by calling it with its expected arguments ---SKIPIF-- - ---INI-- - ---FILE-- -getService( ) ); - -?> -===DONE=== ---CLEAN-- - ---EXPECTF-- -NULL -===DONE=== \ No newline at end of file diff --git a/phpts/Motan_URL/url.inc b/phpts/Motan_URL/url.inc deleted file mode 100644 index fd0ddf1..0000000 --- a/phpts/Motan_URL/url.inc +++ /dev/null @@ -1,5 +0,0 @@ - | - | Preston L. Bannister | - | Marcus Boerger | - | Derick Rethans | - | Sander Roobol | - | (based on version by: Stig Bakken ) | - | (based on the PHP 3 test framework by Rasmus Lerdorf) | - +----------------------------------------------------------------------+ - */ - -/* $Id: f4720f5b76a811a5f7ee1b19ce15e4c68ecf7307 $ */ - -/* Sanity check to ensure that pcre extension needed by this script is available. - * In the event it is not, print a nice error message indicating that this script will - * not run without it. - */ - -if (!extension_loaded('pcre')) { - echo <<'; - save_text($info_file, $php_info); - $info_params = array(); - settings2array($ini_overwrites, $info_params); - settings2params($info_params); - $php_info = `$php $pass_options $info_params $no_file_cache "$info_file"`; - define('TESTED_PHP_VERSION', `$php -n -r "echo PHP_VERSION;"`); - - if ($php_cgi && $php != $php_cgi) { - $php_info_cgi = `$php_cgi $pass_options $info_params $no_file_cache -q "$info_file"`; - $php_info_sep = "\n---------------------------------------------------------------------"; - $php_cgi_info = "$php_info_sep\nPHP : $php_cgi $php_info_cgi$php_info_sep"; - } else { - $php_cgi_info = ''; - } - - if ($phpdbg) { - $phpdbg_info = `$phpdbg $pass_options $info_params $no_file_cache -qrr "$info_file"`; - $php_info_sep = "\n---------------------------------------------------------------------"; - $phpdbg_info = "$php_info_sep\nPHP : $phpdbg $phpdbg_info$php_info_sep"; - } else { - $phpdbg_info = ''; - } - - if (function_exists('opcache_invalidate')) { - opcache_invalidate($info_file, true); - } - @unlink($info_file); - - // load list of enabled extensions - save_text($info_file, ''); - $exts_to_test = explode(',',`$php $pass_options $info_params $no_file_cache "$info_file"`); - // check for extensions that need special handling and regenerate - $info_params_ex = array( - 'session' => array('session.auto_start=0'), - 'tidy' => array('tidy.clean_output=0'), - 'zlib' => array('zlib.output_compression=Off'), - 'xdebug' => array('xdebug.default_enable=0'), - 'mbstring' => array('mbstring.func_overload=0'), - ); - - foreach($info_params_ex as $ext => $ini_overwrites_ex) { - if (in_array($ext, $exts_to_test)) { - $ini_overwrites = array_merge($ini_overwrites, $ini_overwrites_ex); - } - } - - if (function_exists('opcache_invalidate')) { - opcache_invalidate($info_file, true); - } - @unlink($info_file); - - // Write test context information. - echo " -===================================================================== -PHP : $php $php_info $php_cgi_info $phpdbg_info -CWD : $cwd -Extra dirs : "; - foreach ($user_tests as $test_dir) { - echo "{$test_dir}\n "; - } - echo " -VALGRIND : " . ($leak_check ? $valgrind_header : 'Not used') . " -===================================================================== -"; -} - -define('PHP_QA_EMAIL', 'qa-reports@lists.php.net'); -define('QA_SUBMISSION_PAGE', 'http://qa.php.net/buildtest-process.php'); -define('QA_REPORTS_PAGE', 'http://qa.php.net/reports'); -define('TRAVIS_CI' , (bool) getenv('TRAVIS')); - -function save_or_mail_results() -{ - global $sum_results, $just_save_results, $failed_test_summary, - $PHP_FAILED_TESTS, $CUR_DIR, $php, $output_file; - - /* We got failed Tests, offer the user to send an e-mail to QA team, unless NO_INTERACTION is set */ - if (!getenv('NO_INTERACTION') && !TRAVIS_CI) { - $fp = fopen("php://stdin", "r+"); - if ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['WARNED'] || $sum_results['LEAKED']) { - echo "\nYou may have found a problem in PHP."; - } - echo "\nThis report can be automatically sent to the PHP QA team at\n"; - echo QA_REPORTS_PAGE . " and http://news.php.net/php.qa.reports\n"; - echo "This gives us a better understanding of PHP's behavior.\n"; - echo "If you don't want to send the report immediately you can choose\n"; - echo "option \"s\" to save it. You can then email it to ". PHP_QA_EMAIL . " later.\n"; - echo "Do you want to send this report now? [Yns]: "; - flush(); - - $user_input = fgets($fp, 10); - $just_save_results = (strtolower($user_input[0]) == 's'); - } - - if ($just_save_results || !getenv('NO_INTERACTION') || TRAVIS_CI) { - if ($just_save_results || TRAVIS_CI || strlen(trim($user_input)) == 0 || strtolower($user_input[0]) == 'y') { - /* - * Collect information about the host system for our report - * Fetch phpinfo() output so that we can see the PHP environment - * Make an archive of all the failed tests - * Send an email - */ - if ($just_save_results) { - $user_input = 's'; - } - - /* Ask the user to provide an email address, so that QA team can contact the user */ - if (TRAVIS_CI) { - $user_email = 'travis at php dot net'; - } elseif (!strncasecmp($user_input, 'y', 1) || strlen(trim($user_input)) == 0) { - echo "\nPlease enter your email address.\n(Your address will be mangled so that it will not go out on any\nmailinglist in plain text): "; - flush(); - $user_email = trim(fgets($fp, 1024)); - $user_email = str_replace("@", " at ", str_replace(".", " dot ", $user_email)); - } - - $failed_tests_data = ''; - $sep = "\n" . str_repeat('=', 80) . "\n"; - $failed_tests_data .= $failed_test_summary . "\n"; - $failed_tests_data .= get_summary(true, false) . "\n"; - - if ($sum_results['FAILED']) { - foreach ($PHP_FAILED_TESTS['FAILED'] as $test_info) { - $failed_tests_data .= $sep . $test_info['name'] . $test_info['info']; - $failed_tests_data .= $sep . file_get_contents(realpath($test_info['output']), FILE_BINARY); - $failed_tests_data .= $sep . file_get_contents(realpath($test_info['diff']), FILE_BINARY); - $failed_tests_data .= $sep . "\n\n"; - } - $status = "failed"; - } else { - $status = "success"; - } - - $failed_tests_data .= "\n" . $sep . 'BUILD ENVIRONMENT' . $sep; - $failed_tests_data .= "OS:\n" . PHP_OS . " - " . php_uname() . "\n\n"; - $ldd = $autoconf = $sys_libtool = $libtool = $compiler = 'N/A'; - - if (substr(PHP_OS, 0, 3) != "WIN") { - /* If PHP_AUTOCONF is set, use it; otherwise, use 'autoconf'. */ - if (getenv('PHP_AUTOCONF')) { - $autoconf = shell_exec(getenv('PHP_AUTOCONF') . ' --version'); - } else { - $autoconf = shell_exec('autoconf --version'); - } - - /* Always use the generated libtool - Mac OSX uses 'glibtool' */ - $libtool = shell_exec($CUR_DIR . '/libtool --version'); - - /* Use shtool to find out if there is glibtool present (MacOSX) */ - $sys_libtool_path = shell_exec(__DIR__ . '/build/shtool path glibtool libtool'); - - if ($sys_libtool_path) { - $sys_libtool = shell_exec(str_replace("\n", "", $sys_libtool_path) . ' --version'); - } - - /* Try the most common flags for 'version' */ - $flags = array('-v', '-V', '--version'); - $cc_status = 0; - - foreach($flags AS $flag) { - system(getenv('CC') . " $flag >/dev/null 2>&1", $cc_status); - if ($cc_status == 0) { - $compiler = shell_exec(getenv('CC') . " $flag 2>&1"); - break; - } - } - - $ldd = shell_exec("ldd $php 2>/dev/null"); - } - - $failed_tests_data .= "Autoconf:\n$autoconf\n"; - $failed_tests_data .= "Bundled Libtool:\n$libtool\n"; - $failed_tests_data .= "System Libtool:\n$sys_libtool\n"; - $failed_tests_data .= "Compiler:\n$compiler\n"; - $failed_tests_data .= "Bison:\n". shell_exec('bison --version 2>/dev/null') . "\n"; - $failed_tests_data .= "Libraries:\n$ldd\n"; - $failed_tests_data .= "\n"; - - if (isset($user_email)) { - $failed_tests_data .= "User's E-mail: " . $user_email . "\n\n"; - } - - $failed_tests_data .= $sep . "PHPINFO" . $sep; - $failed_tests_data .= shell_exec($php . ' -ddisplay_errors=stderr -dhtml_errors=0 -i 2> /dev/null'); - - if (($just_save_results || !mail_qa_team($failed_tests_data, $status)) && !TRAVIS_CI) { - file_put_contents($output_file, $failed_tests_data); - - if (!$just_save_results) { - echo "\nThe test script was unable to automatically send the report to PHP's QA Team\n"; - } - - echo "Please send " . $output_file . " to " . PHP_QA_EMAIL . " manually, thank you.\n"; - } elseif (!getenv('NO_INTERACTION') && !TRAVIS_CI) { - fwrite($fp, "\nThank you for helping to make PHP better.\n"); - fclose($fp); - } - } - } -} - -// Determine the tests to be run. - -$test_files = array(); -$redir_tests = array(); -$test_results = array(); -$PHP_FAILED_TESTS = array('BORKED' => array(), 'FAILED' => array(), 'WARNED' => array(), 'LEAKED' => array(), 'XFAILED' => array(), 'SLOW' => array()); - -// If parameters given assume they represent selected tests to run. -$result_tests_file= false; -$failed_tests_file= false; -$pass_option_n = false; -$pass_options = ''; - -$output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . '.txt'; - -$just_save_results = false; -$leak_check = false; -$html_output = false; -$html_file = null; -$temp_source = null; -$temp_target = null; -$temp_urlbase = null; -$conf_passed = null; -$no_clean = false; -$slow_min_ms = INF; - -$cfgtypes = array('show', 'keep'); -$cfgfiles = array('skip', 'php', 'clean', 'out', 'diff', 'exp'); -$cfg = array(); - -foreach($cfgtypes as $type) { - $cfg[$type] = array(); - - foreach($cfgfiles as $file) { - $cfg[$type][$file] = false; - } -} - -if (getenv('TEST_PHP_ARGS')) { - - if (!isset($argc, $argv) || !$argc) { - $argv = array(__FILE__); - } - - $argv = array_merge($argv, explode(' ', getenv('TEST_PHP_ARGS'))); - $argc = count($argv); -} - -if (isset($argc) && $argc > 1) { - - for ($i=1; $i<$argc; $i++) { - $is_switch = false; - $switch = substr($argv[$i],1,1); - $repeat = substr($argv[$i],0,1) == '-'; - - while ($repeat) { - - if (!$is_switch) { - $switch = substr($argv[$i],1,1); - } - - $is_switch = true; - - if ($repeat) { - foreach($cfgtypes as $type) { - if (strpos($switch, '--' . $type) === 0) { - foreach($cfgfiles as $file) { - if ($switch == '--' . $type . '-' . $file) { - $cfg[$type][$file] = true; - $is_switch = false; - break; - } - } - } - } - } - - if (!$is_switch) { - $is_switch = true; - break; - } - - $repeat = false; - - switch($switch) { - case 'r': - case 'l': - $test_list = file($argv[++$i]); - if ($test_list) { - foreach($test_list as $test) { - $matches = array(); - if (preg_match('/^#.*\[(.*)\]\:\s+(.*)$/', $test, $matches)) { - $redir_tests[] = array($matches[1], $matches[2]); - } else if (strlen($test)) { - $test_files[] = trim($test); - } - } - } - if ($switch != 'l') { - break; - } - $i--; - // break left intentionally - case 'w': - $failed_tests_file = fopen($argv[++$i], 'w+t'); - break; - case 'a': - $failed_tests_file = fopen($argv[++$i], 'a+t'); - break; - case 'W': - $result_tests_file = fopen($argv[++$i], 'w+t'); - break; - case 'c': - $conf_passed = $argv[++$i]; - break; - case 'd': - $ini_overwrites[] = $argv[++$i]; - break; - case 'g': - $SHOW_ONLY_GROUPS = explode(",", $argv[++$i]); - break; - //case 'h' - case '--keep-all': - foreach($cfgfiles as $file) { - $cfg['keep'][$file] = true; - } - break; - //case 'l' - case 'm': - $leak_check = true; - $valgrind_cmd = "valgrind --version"; - $valgrind_header = system_with_timeout($valgrind_cmd, $environment); - $replace_count = 0; - if (!$valgrind_header) { - error("Valgrind returned no version info, cannot proceed.\nPlease check if Valgrind is installed."); - } else { - $valgrind_version = preg_replace("/valgrind-(\d+)\.(\d+)\.(\d+)([.\w_-]+)?(\s+)/", '$1.$2.$3', $valgrind_header, 1, $replace_count); - if ($replace_count != 1) { - error("Valgrind returned invalid version info (\"$valgrind_header\"), cannot proceed."); - } - $valgrind_header = trim($valgrind_header); - } - break; - case 'n': - if (!$pass_option_n) { - $pass_options .= ' -n'; - } - $pass_option_n = true; - break; - case 'e': - $pass_options .= ' -e'; - break; - case '--no-clean': - $no_clean = true; - break; - case 'p': - $php = $argv[++$i]; - putenv("TEST_PHP_EXECUTABLE=$php"); - $environment['TEST_PHP_EXECUTABLE'] = $php; - break; - case 'P': - if(constant('PHP_BINARY')) { - $php = PHP_BINARY; - } else { - break; - } - putenv("TEST_PHP_EXECUTABLE=$php"); - $environment['TEST_PHP_EXECUTABLE'] = $php; - break; - case 'q': - putenv('NO_INTERACTION=1'); - break; - //case 'r' - case 's': - $output_file = $argv[++$i]; - $just_save_results = true; - break; - case '--set-timeout': - $environment['TEST_TIMEOUT'] = $argv[++$i]; - break; - case '--show-all': - foreach($cfgfiles as $file) { - $cfg['show'][$file] = true; - } - break; - case '--show-slow': - $slow_min_ms = $argv[++$i]; - break; - case '--temp-source': - $temp_source = $argv[++$i]; - break; - case '--temp-target': - $temp_target = $argv[++$i]; - if ($temp_urlbase) { - $temp_urlbase = $temp_target; - } - break; - case '--temp-urlbase': - $temp_urlbase = $argv[++$i]; - break; - case 'v': - case '--verbose': - $DETAILED = true; - break; - case 'x': - $environment['SKIP_SLOW_TESTS'] = 1; - break; - case '--offline': - $environment['SKIP_ONLINE_TESTS'] = 1; - break; - //case 'w' - case '-': - // repeat check with full switch - $switch = $argv[$i]; - if ($switch != '-') { - $repeat = true; - } - break; - case '--html': - $html_file = fopen($argv[++$i], 'wt'); - $html_output = is_resource($html_file); - break; - case '--version': - echo '$Id: f4720f5b76a811a5f7ee1b19ce15e4c68ecf7307 $' . "\n"; - exit(1); - - default: - echo "Illegal switch '$switch' specified!\n"; - case 'h': - case '-help': - case '--help': - echo << Read the testfiles to be executed from . After the test - has finished all failed tests are written to the same . - If the list is empty and no further test is specified then - all tests are executed (same as: -r -w ). - - -r Read the testfiles to be executed from . - - -w Write a list of all failed tests to . - - -a Same as -w but append rather then truncating . - - -W Write a list of all tests and their result status to . - - -c Look for php.ini in directory or use as ini. - - -n Pass -n option to the php binary (Do not use a php.ini). - - -d foo=bar Pass -d option to the php binary (Define INI entry foo - with value 'bar'). - - -g Comma separated list of groups to show during test run - (possible values: PASS, FAIL, XFAIL, SKIP, BORK, WARN, LEAK, REDIRECT). - - -m Test for memory leaks with Valgrind. - - -p Specify PHP executable to run. - - -P Use PHP_BINARY as PHP executable to run. - - -q Quiet, no user interaction (same as environment NO_INTERACTION). - - -s Write output to . - - -x Sets 'SKIP_SLOW_TESTS' environmental variable. - - --offline Sets 'SKIP_ONLINE_TESTS' environmental variable. - - --verbose - -v Verbose mode. - - --help - -h This Help. - - --html Generate HTML output. - - --temp-source --temp-target [--temp-urlbase ] - Write temporary files to by replacing from the - filenames to generate with . If --html is being used and - given then the generated links are relative and prefixed - with the given url. In general you want to make the path - to your source files and some pach in your web page - hierarchy with pointing to . - - --keep-[all|php|skip|clean] - Do not delete 'all' files, 'php' test file, 'skip' or 'clean' - file. - - --set-timeout [n] - Set timeout for individual tests, where [n] is the number of - seconds. The default value is 60 seconds, or 300 seconds when - testing for memory leaks. - - --show-[all|php|skip|clean|exp|diff|out] - Show 'all' files, 'php' test file, 'skip' or 'clean' file. You - can also use this to show the output 'out', the expected result - 'exp' or the difference between them 'diff'. The result types - get written independent of the log format, however 'diff' only - exists when a test fails. - - --show-slow [n] - Show all tests that took longer than [n] milliseconds to run. - - --no-clean Do not execute clean section if any. - -HELP; - exit(1); - } - } - - if (!$is_switch) { - $testfile = realpath($argv[$i]); - - if (!$testfile && strpos($argv[$i], '*') !== false && function_exists('glob')) { - - if (preg_match("/\.phpt$/", $argv[$i])) { - $pattern_match = glob($argv[$i]); - } else if (preg_match("/\*$/", $argv[$i])) { - $pattern_match = glob($argv[$i] . '.phpt'); - } else { - die("bogus test name " . $argv[$i] . "\n"); - } - - if (is_array($pattern_match)) { - $test_files = array_merge($test_files, $pattern_match); - } - - } else if (is_dir($testfile)) { - find_files($testfile); - } else if (preg_match("/\.phpt$/", $testfile)) { - $test_files[] = $testfile; - } else { - die("bogus test name " . $argv[$i] . "\n"); - } - } - } - - if (strlen($conf_passed)) { - if (substr(PHP_OS, 0, 3) == "WIN") { - $pass_options .= " -c " . escapeshellarg($conf_passed); - } else { - $pass_options .= " -c '$conf_passed'"; - } - } - - $test_files = array_unique($test_files); - $test_files = array_merge($test_files, $redir_tests); - - // Run selected tests. - $test_cnt = count($test_files); - - if ($test_cnt) { - putenv('NO_INTERACTION=1'); - verify_config(); - write_information(); - usort($test_files, "test_sort"); - $start_time = time(); - - if (!$html_output) { - echo "Running selected tests.\n"; - } else { - show_start($start_time); - } - - $test_idx = 0; - run_all_tests($test_files, $environment); - $end_time = time(); - - if ($html_output) { - show_end($end_time); - } - - if ($failed_tests_file) { - fclose($failed_tests_file); - } - - if ($result_tests_file) { - fclose($result_tests_file); - } - - compute_summary(); - if ($html_output) { - fwrite($html_file, "
\n" . get_summary(false, true)); - } - echo "====================================================================="; - echo get_summary(false, false); - - if ($html_output) { - fclose($html_file); - } - - if ($output_file != '' && $just_save_results) { - save_or_mail_results(); - } - - junit_save_xml(); - - if (getenv('REPORT_EXIT_STATUS') !== '0' && - getenv('REPORT_EXIT_STATUS') !== 'no' && - ($sum_results['FAILED'] || $sum_results['BORKED'])) { - exit(1); - } - - exit(0); - } -} - -verify_config(); -write_information(); - -// Compile a list of all test files (*.phpt). -$test_files = array(); -$exts_tested = count($exts_to_test); -$exts_skipped = 0; -$ignored_by_ext = 0; -sort($exts_to_test); -$test_dirs = array(); -$optionals = array('tests', 'ext', 'Zend', 'sapi'); - -foreach($optionals as $dir) { - if (@filetype($dir) == 'dir') { - $test_dirs[] = $dir; - } -} - -// Convert extension names to lowercase -foreach ($exts_to_test as $key => $val) { - $exts_to_test[$key] = strtolower($val); -} - -foreach ($test_dirs as $dir) { - find_files("{$cwd}/{$dir}", ($dir == 'ext')); -} - -foreach ($user_tests as $dir) { - find_files($dir, ($dir == 'ext')); -} - -function find_files($dir, $is_ext_dir = false, $ignore = false) -{ - global $test_files, $exts_to_test, $ignored_by_ext, $exts_skipped; - - $o = opendir($dir) or error("cannot open directory: $dir"); - - while (($name = readdir($o)) !== false) { - - if (is_dir("{$dir}/{$name}") && !in_array($name, array('.', '..', '.svn'))) { - $skip_ext = ($is_ext_dir && !in_array(strtolower($name), $exts_to_test)); - if ($skip_ext) { - $exts_skipped++; - } - find_files("{$dir}/{$name}", false, $ignore || $skip_ext); - } - - // Cleanup any left-over tmp files from last run. - if (substr($name, -4) == '.tmp') { - @unlink("$dir/$name"); - continue; - } - - // Otherwise we're only interested in *.phpt files. - if (substr($name, -5) == '.phpt') { - if ($ignore) { - $ignored_by_ext++; - } else { - $testfile = realpath("{$dir}/{$name}"); - $test_files[] = $testfile; - } - } - } - - closedir($o); -} - -function test_name($name) -{ - if (is_array($name)) { - return $name[0] . ':' . $name[1]; - } else { - return $name; - } -} - -function test_sort($a, $b) -{ - global $cwd; - - $a = test_name($a); - $b = test_name($b); - - $ta = strpos($a, "{$cwd}/tests") === 0 ? 1 + (strpos($a, "{$cwd}/tests/run-test") === 0 ? 1 : 0) : 0; - $tb = strpos($b, "{$cwd}/tests") === 0 ? 1 + (strpos($b, "{$cwd}/tests/run-test") === 0 ? 1 : 0) : 0; - - if ($ta == $tb) { - return strcmp($a, $b); - } else { - return $tb - $ta; - } -} - -$test_files = array_unique($test_files); -usort($test_files, "test_sort"); - -$start_time = time(); -show_start($start_time); - -$test_cnt = count($test_files); -$test_idx = 0; -run_all_tests($test_files, $environment); -$end_time = time(); - -if ($failed_tests_file) { - fclose($failed_tests_file); -} - -if ($result_tests_file) { - fclose($result_tests_file); -} - -// Summarize results - -if (0 == count($test_results)) { - echo "No tests were run.\n"; - return; -} - -compute_summary(); - -show_end($end_time); -show_summary(); - -if ($html_output) { - fclose($html_file); -} - -save_or_mail_results(); - -junit_save_xml(); - -if (getenv('REPORT_EXIT_STATUS') !== '0' && - getenv('REPORT_EXIT_STATUS') !== 'no' && - ($sum_results['FAILED'] || $sum_results['BORKED'])) { - exit(1); -} -exit(0); - -// -// Send Email to QA Team -// - -function mail_qa_team($data, $status = false) -{ - $url_bits = parse_url(QA_SUBMISSION_PAGE); - - if (($proxy = getenv('http_proxy'))) { - $proxy = parse_url($proxy); - $path = $url_bits['host'].$url_bits['path']; - $host = $proxy['host']; - if (empty($proxy['port'])) { - $proxy['port'] = 80; - } - $port = $proxy['port']; - } else { - $path = $url_bits['path']; - $host = $url_bits['host']; - $port = empty($url_bits['port']) ? 80 : $port = $url_bits['port']; - } - - $data = "php_test_data=" . urlencode(base64_encode(str_replace("\00", '[0x0]', $data))); - $data_length = strlen($data); - - $fs = fsockopen($host, $port, $errno, $errstr, 10); - - if (!$fs) { - return false; - } - - $php_version = urlencode(TESTED_PHP_VERSION); - - echo "\nPosting to ". QA_SUBMISSION_PAGE . "\n"; - fwrite($fs, "POST " . $path . "?status=$status&version=$php_version HTTP/1.1\r\n"); - fwrite($fs, "Host: " . $host . "\r\n"); - fwrite($fs, "User-Agent: QA Browser 0.1\r\n"); - fwrite($fs, "Content-Type: application/x-www-form-urlencoded\r\n"); - fwrite($fs, "Content-Length: " . $data_length . "\r\n\r\n"); - fwrite($fs, $data); - fwrite($fs, "\r\n\r\n"); - fclose($fs); - - return 1; -} - - -// -// Write the given text to a temporary file, and return the filename. -// - -function save_text($filename, $text, $filename_copy = null) -{ - global $DETAILED; - - if ($filename_copy && $filename_copy != $filename) { - if (file_put_contents($filename_copy, $text, FILE_BINARY) === false) { - error("Cannot open file '" . $filename_copy . "' (save_text)"); - } - } - - if (file_put_contents($filename, $text, FILE_BINARY) === false) { - error("Cannot open file '" . $filename . "' (save_text)"); - } - - if (1 < $DETAILED) echo " -FILE $filename {{{ -$text -}}} -"; -} - -// -// Write an error in a format recognizable to Emacs or MSVC. -// - -function error_report($testname, $logname, $tested) -{ - $testname = realpath($testname); - $logname = realpath($logname); - - switch (strtoupper(getenv('TEST_PHP_ERROR_STYLE'))) { - case 'MSVC': - echo $testname . "(1) : $tested\n"; - echo $logname . "(1) : $tested\n"; - break; - case 'EMACS': - echo $testname . ":1: $tested\n"; - echo $logname . ":1: $tested\n"; - break; - } -} - -function system_with_timeout($commandline, $env = null, $stdin = null, $captureStdIn = true, $captureStdOut = true, $captureStdErr = true) -{ - global $leak_check, $cwd; - - $data = ''; - - $bin_env = array(); - foreach((array)$env as $key => $value) { - $bin_env[$key] = $value; - } - - $descriptorspec = array(); - if ($captureStdIn) { - $descriptorspec[0] = array('pipe', 'r'); - } - if ($captureStdOut) { - $descriptorspec[1] = array('pipe', 'w'); - } - if ($captureStdErr) { - $descriptorspec[2] = array('pipe', 'w'); - } - $proc = proc_open($commandline, $descriptorspec, $pipes, $cwd, $bin_env, array('suppress_errors' => true, 'binary_pipes' => true)); - - if (!$proc) { - return false; - } - - if ($captureStdIn) { - if (!is_null($stdin)) { - fwrite($pipes[0], $stdin); - } - fclose($pipes[0]); - unset($pipes[0]); - } - - $timeout = $leak_check ? 300 : (isset($env['TEST_TIMEOUT']) ? $env['TEST_TIMEOUT'] : 60); - - while (true) { - /* hide errors from interrupted syscalls */ - $r = $pipes; - $w = null; - $e = null; - - $n = @stream_select($r, $w, $e, $timeout); - - if ($n === false) { - break; - } else if ($n === 0) { - /* timed out */ - $data .= "\n ** ERROR: process timed out **\n"; - proc_terminate($proc, 9); - return $data; - } else if ($n > 0) { - if ($captureStdOut) { - $line = fread($pipes[1], 8192); - } elseif ($captureStdErr) { - $line = fread($pipes[2], 8192); - } else { - $line = ''; - } - if (strlen($line) == 0) { - /* EOF */ - break; - } - $data .= $line; - } - } - - $stat = proc_get_status($proc); - - if ($stat['signaled']) { - $data .= "\nTermsig=" . $stat['stopsig'] . "\n"; - } - if ($stat["exitcode"] > 128 && $stat["exitcode"] < 160) { - $data .= "\nTermsig=" . ($stat["exitcode"] - 128) . "\n"; - } - - proc_close($proc); - return $data; -} - -function run_all_tests($test_files, $env, $redir_tested = null) -{ - global $test_results, $failed_tests_file, $result_tests_file, $php, $test_idx; - - foreach($test_files as $name) { - - if (is_array($name)) { - $index = "# $name[1]: $name[0]"; - - if ($redir_tested) { - $name = $name[0]; - } - } else if ($redir_tested) { - $index = "# $redir_tested: $name"; - } else { - $index = $name; - } - $test_idx++; - $result = run_test($php, $name, $env); - - if (!is_array($name) && $result != 'REDIR') { - $test_results[$index] = $result; - if ($failed_tests_file && ($result == 'XFAILED' || $result == 'FAILED' || $result == 'WARNED' || $result == 'LEAKED')) { - fwrite($failed_tests_file, "$index\n"); - } - if ($result_tests_file) { - fwrite($result_tests_file, "$result\t$index\n"); - } - } - } -} - -// -// Show file or result block -// -function show_file_block($file, $block, $section = null) -{ - global $cfg; - - if ($cfg['show'][$file]) { - - if (is_null($section)) { - $section = strtoupper($file); - } - - echo "\n========" . $section . "========\n"; - echo rtrim($block); - echo "\n========DONE========\n"; - } -} - -// -// Run an individual test case. -// -function run_test($php, $file, $env) -{ - global $log_format, $ini_overwrites, $cwd, $PHP_FAILED_TESTS; - global $pass_options, $DETAILED, $IN_REDIRECT, $test_cnt, $test_idx; - global $leak_check, $temp_source, $temp_target, $cfg, $environment; - global $no_clean; - global $valgrind_version; - global $SHOW_ONLY_GROUPS; - global $no_file_cache; - global $slow_min_ms; - $temp_filenames = null; - $org_file = $file; - - if (isset($env['TEST_PHP_CGI_EXECUTABLE'])) { - $php_cgi = $env['TEST_PHP_CGI_EXECUTABLE']; - } - - if (isset($env['TEST_PHPDBG_EXECUTABLE'])) { - $phpdbg = $env['TEST_PHPDBG_EXECUTABLE']; - } - - if (is_array($file)) { - $file = $file[0]; - } - - if ($DETAILED) echo " -================= -TEST $file -"; - - // Load the sections of the test file. - $section_text = array('TEST' => ''); - - $fp = fopen($file, "rb") or error("Cannot open test file: $file"); - - $borked = false; - $bork_info = ''; - - if (!feof($fp)) { - $line = fgets($fp); - - if ($line === false) { - $bork_info = "cannot read test"; - $borked = true; - } - } else { - $bork_info = "empty test [$file]"; - $borked = true; - } - if (!$borked && strncmp('--TEST--', $line, 8)) { - $bork_info = "tests must start with --TEST-- [$file]"; - $borked = true; - } - - $section = 'TEST'; - $secfile = false; - $secdone = false; - - while (!feof($fp)) { - $line = fgets($fp); - - if ($line === false) { - break; - } - - // Match the beginning of a section. - if (preg_match('/^--([_A-Z]+)--/', $line, $r)) { - $section = $r[1]; - settype($section, 'string'); - - if (isset($section_text[$section])) { - $bork_info = "duplicated $section section"; - $borked = true; - } - - $section_text[$section] = ''; - $secfile = $section == 'FILE' || $section == 'FILEEOF' || $section == 'FILE_EXTERNAL'; - $secdone = false; - continue; - } - - // Add to the section text. - if (!$secdone) { - $section_text[$section] .= $line; - } - - // End of actual test? - if ($secfile && preg_match('/^===DONE===\s*$/', $line)) { - $secdone = true; - } - } - - // the redirect section allows a set of tests to be reused outside of - // a given test dir - if (!$borked) { - if (@count($section_text['REDIRECTTEST']) == 1) { - - if ($IN_REDIRECT) { - $borked = true; - $bork_info = "Can't redirect a test from within a redirected test"; - } else { - $borked = false; - } - - } else { - - if (!isset($section_text['PHPDBG']) && @count($section_text['FILE']) + @count($section_text['FILEEOF']) + @count($section_text['FILE_EXTERNAL']) != 1) { - $bork_info = "missing section --FILE--"; - $borked = true; - } - - if (@count($section_text['FILEEOF']) == 1) { - $section_text['FILE'] = preg_replace("/[\r\n]+$/", '', $section_text['FILEEOF']); - unset($section_text['FILEEOF']); - } - - foreach (array( 'FILE', 'EXPECT', 'EXPECTF', 'EXPECTREGEX' ) as $prefix) { - $key = $prefix . '_EXTERNAL'; - - if (@count($section_text[$key]) == 1) { - // don't allow tests to retrieve files from anywhere but this subdirectory - $section_text[$key] = dirname($file) . '/' . trim(str_replace('..', '', $section_text[$key])); - - if (file_exists($section_text[$key])) { - $section_text[$prefix] = file_get_contents($section_text[$key], FILE_BINARY); - unset($section_text[$key]); - } else { - $bork_info = "could not load --" . $key . "-- " . dirname($file) . '/' . trim($section_text[$key]); - $borked = true; - } - } - } - - if ((@count($section_text['EXPECT']) + @count($section_text['EXPECTF']) + @count($section_text['EXPECTREGEX'])) != 1) { - $bork_info = "missing section --EXPECT--, --EXPECTF-- or --EXPECTREGEX--"; - $borked = true; - } - } - } - fclose($fp); - - $shortname = str_replace($cwd . '/', '', $file); - $tested_file = $shortname; - - if ($borked) { - show_result("BORK", $bork_info, $tested_file); - $PHP_FAILED_TESTS['BORKED'][] = array ( - 'name' => $file, - 'test_name' => '', - 'output' => '', - 'diff' => '', - 'info' => "$bork_info [$file]", - ); - - junit_mark_test_as('BORK', $shortname, $tested_file, 0, $bork_info); - return 'BORKED'; - } - - if (isset($section_text['CAPTURE_STDIO'])) { - $captureStdIn = stripos($section_text['CAPTURE_STDIO'], 'STDIN') !== false; - $captureStdOut = stripos($section_text['CAPTURE_STDIO'], 'STDOUT') !== false; - $captureStdErr = stripos($section_text['CAPTURE_STDIO'], 'STDERR') !== false; - } else { - $captureStdIn = true; - $captureStdOut = true; - $captureStdErr = true; - } - if ($captureStdOut && $captureStdErr) { - $cmdRedirect = ' 2>&1'; - } else { - $cmdRedirect = ''; - } - - $tested = trim($section_text['TEST']); - - /* For GET/POST/PUT tests, check if cgi sapi is available and if it is, use it. */ - if (!empty($section_text['GET']) || !empty($section_text['POST']) || !empty($section_text['GZIP_POST']) || !empty($section_text['DEFLATE_POST']) || !empty($section_text['POST_RAW']) || !empty($section_text['PUT']) || !empty($section_text['COOKIE']) || !empty($section_text['EXPECTHEADERS'])) { - if (isset($php_cgi)) { - $old_php = $php; - $php = $php_cgi . ' -C '; - } else if (!strncasecmp(PHP_OS, "win", 3) && file_exists(dirname($php) . "/php-cgi.exe")) { - $old_php = $php; - $php = realpath(dirname($php) . "/php-cgi.exe") . ' -C '; - } else { - if (file_exists(dirname($php) . "/../../sapi/cgi/php-cgi")) { - $old_php = $php; - $php = realpath(dirname($php) . "/../../sapi/cgi/php-cgi") . ' -C '; - } else if (file_exists("./sapi/cgi/php-cgi")) { - $old_php = $php; - $php = realpath("./sapi/cgi/php-cgi") . ' -C '; - } else if (file_exists(dirname($php) . "/php-cgi")) { - $old_php = $php; - $php = realpath(dirname($php) . "/php-cgi") . ' -C '; - } else { - show_result('SKIP', $tested, $tested_file, "reason: CGI not available"); - - junit_init_suite(junit_get_suitename_for($shortname)); - junit_mark_test_as('SKIP', $shortname, $tested, 0, 'CGI not available'); - return 'SKIPPED'; - } - } - $uses_cgi = true; - } - - /* For phpdbg tests, check if phpdbg sapi is available and if it is, use it. */ - if (array_key_exists('PHPDBG', $section_text)) { - if (!isset($section_text['STDIN'])) { - $section_text['STDIN'] = $section_text['PHPDBG']."\n"; - } - - if (isset($phpdbg)) { - $old_php = $php; - $php = $phpdbg . ' -qIb'; - } else { - show_result('SKIP', $tested, $tested_file, "reason: phpdbg not available"); - - junit_init_suite(junit_get_suitename_for($shortname)); - junit_mark_test_as('SKIP', $shortname, $tested, 0, 'phpdbg not available'); - return 'SKIPPED'; - } - } - - if (!$SHOW_ONLY_GROUPS) { - show_test($test_idx, $shortname); - } - - if (is_array($IN_REDIRECT)) { - $temp_dir = $test_dir = $IN_REDIRECT['dir']; - } else { - $temp_dir = $test_dir = realpath(dirname($file)); - } - - if ($temp_source && $temp_target) { - $temp_dir = str_replace($temp_source, $temp_target, $temp_dir); - } - - $main_file_name = basename($file,'phpt'); - - $diff_filename = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'diff'; - $log_filename = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'log'; - $exp_filename = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'exp'; - $output_filename = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'out'; - $memcheck_filename = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'mem'; - $sh_filename = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'sh'; - $temp_file = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'php'; - $test_file = $test_dir . DIRECTORY_SEPARATOR . $main_file_name . 'php'; - $temp_skipif = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'skip.php'; - $test_skipif = $test_dir . DIRECTORY_SEPARATOR . $main_file_name . 'skip.php'; - $temp_clean = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'clean.php'; - $test_clean = $test_dir . DIRECTORY_SEPARATOR . $main_file_name . 'clean.php'; - $tmp_post = $temp_dir . DIRECTORY_SEPARATOR . uniqid('/phpt.'); - $tmp_relative_file = str_replace(__DIR__ . DIRECTORY_SEPARATOR, '', $test_file) . 't'; - - if ($temp_source && $temp_target) { - $temp_skipif .= 's'; - $temp_file .= 's'; - $temp_clean .= 's'; - $copy_file = $temp_dir . DIRECTORY_SEPARATOR . basename(is_array($file) ? $file[1] : $file) . '.phps'; - - if (!is_dir(dirname($copy_file))) { - mkdir(dirname($copy_file), 0777, true) or error("Cannot create output directory - " . dirname($copy_file)); - } - - if (isset($section_text['FILE'])) { - save_text($copy_file, $section_text['FILE']); - } - - $temp_filenames = array( - 'file' => $copy_file, - 'diff' => $diff_filename, - 'log' => $log_filename, - 'exp' => $exp_filename, - 'out' => $output_filename, - 'mem' => $memcheck_filename, - 'sh' => $sh_filename, - 'php' => $temp_file, - 'skip' => $temp_skipif, - 'clean'=> $temp_clean); - } - - if (is_array($IN_REDIRECT)) { - $tested = $IN_REDIRECT['prefix'] . ' ' . trim($section_text['TEST']); - $tested_file = $tmp_relative_file; - } - - // unlink old test results - @unlink($diff_filename); - @unlink($log_filename); - @unlink($exp_filename); - @unlink($output_filename); - @unlink($memcheck_filename); - @unlink($sh_filename); - @unlink($temp_file); - @unlink($test_file); - @unlink($temp_skipif); - @unlink($test_skipif); - @unlink($tmp_post); - @unlink($temp_clean); - @unlink($test_clean); - - // Reset environment from any previous test. - $env['REDIRECT_STATUS'] = ''; - $env['QUERY_STRING'] = ''; - $env['PATH_TRANSLATED'] = ''; - $env['SCRIPT_FILENAME'] = ''; - $env['REQUEST_METHOD'] = ''; - $env['CONTENT_TYPE'] = ''; - $env['CONTENT_LENGTH'] = ''; - $env['TZ'] = ''; - - if (!empty($section_text['ENV'])) { - - foreach(explode("\n", trim($section_text['ENV'])) as $e) { - $e = explode('=', trim($e), 2); - - if (!empty($e[0]) && isset($e[1])) { - $env[$e[0]] = $e[1]; - } - } - } - - // Default ini settings - $ini_settings = array(); - - // Additional required extensions - if (array_key_exists('EXTENSIONS', $section_text)) { - $ext_params = array(); - settings2array($ini_overwrites, $ext_params); - settings2params($ext_params); - $ext_dir=`$php $pass_options $ext_params -d display_errors=0 -r "echo ini_get('extension_dir');"`; - $extensions = preg_split("/[\n\r]+/", trim($section_text['EXTENSIONS'])); - $loaded = explode(",", `$php $pass_options $ext_params -d display_errors=0 -r "echo implode(',', get_loaded_extensions());"`); - $ext_prefix = substr(PHP_OS, 0, 3) === "WIN" ? "php_" : ""; - foreach ($extensions as $req_ext) { - if (!in_array($req_ext, $loaded)) { - if ($req_ext == 'opcache') { - $ini_settings['zend_extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $ext_prefix . $req_ext . '.' . PHP_SHLIB_SUFFIX; - } else { - $ini_settings['extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $ext_prefix . $req_ext . '.' . PHP_SHLIB_SUFFIX; - } - } - } - } - - // additional ini overwrites - //$ini_overwrites[] = 'setting=value'; - settings2array($ini_overwrites, $ini_settings); - - // Any special ini settings - // these may overwrite the test defaults... - if (array_key_exists('INI', $section_text)) { - if (strpos($section_text['INI'], '{PWD}') !== false) { - $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']); - } - settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings); - } - - settings2params($ini_settings); - - // Check if test should be skipped. - $info = ''; - $warn = false; - - if (array_key_exists('SKIPIF', $section_text)) { - - if (trim($section_text['SKIPIF'])) { - show_file_block('skip', $section_text['SKIPIF']); - save_text($test_skipif, $section_text['SKIPIF'], $temp_skipif); - $extra = substr(PHP_OS, 0, 3) !== "WIN" ? - "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": ""; - - if ($leak_check) { - $env['USE_ZEND_ALLOC'] = '0'; - $env['ZEND_DONT_UNLOAD_MODULES'] = 1; - } else { - $env['USE_ZEND_ALLOC'] = '1'; - $env['ZEND_DONT_UNLOAD_MODULES'] = 0; - } - - junit_start_timer($shortname); - - $output = system_with_timeout("$extra $php $pass_options -q $ini_settings $no_file_cache -d display_errors=0 \"$test_skipif\"", $env); - - junit_finish_timer($shortname); - - if (!$cfg['keep']['skip']) { - @unlink($test_skipif); - } - - if (!strncasecmp('skip', ltrim($output), 4)) { - - if (preg_match('/^\s*skip\s*(.+)\s*/i', $output, $m)) { - show_result('SKIP', $tested, $tested_file, "reason: $m[1]", $temp_filenames); - } else { - show_result('SKIP', $tested, $tested_file, '', $temp_filenames); - } - - if (!$cfg['keep']['skip']) { - @unlink($test_skipif); - } - - $message = !empty($m[1]) ? $m[1] : ''; - junit_mark_test_as('SKIP', $shortname, $tested, null, $message); - return 'SKIPPED'; - } - - if (!strncasecmp('info', ltrim($output), 4)) { - if (preg_match('/^\s*info\s*(.+)\s*/i', $output, $m)) { - $info = " (info: $m[1])"; - } - } - - if (!strncasecmp('warn', ltrim($output), 4)) { - if (preg_match('/^\s*warn\s*(.+)\s*/i', $output, $m)) { - $warn = true; /* only if there is a reason */ - $info = " (warn: $m[1])"; - } - } - - if (!strncasecmp('xfail', ltrim($output), 5)) { - // Pretend we have an XFAIL section - $section_text['XFAIL'] = trim(substr(ltrim($output), 5)); - } - } - } - - if (!extension_loaded("zlib") - && ( array_key_exists("GZIP_POST", $section_text) - || array_key_exists("DEFLATE_POST", $section_text)) - ) { - $message = "ext/zlib required"; - show_result('SKIP', $tested, $tested_file, "reason: $message", $temp_filenames); - junit_mark_test_as('SKIP', $shortname, $tested, null, $message); - return 'SKIPPED'; - } - - if (@count($section_text['REDIRECTTEST']) == 1) { - $test_files = array(); - - $IN_REDIRECT = eval($section_text['REDIRECTTEST']); - $IN_REDIRECT['via'] = "via [$shortname]\n\t"; - $IN_REDIRECT['dir'] = realpath(dirname($file)); - $IN_REDIRECT['prefix'] = trim($section_text['TEST']); - - if (!empty($IN_REDIRECT['TESTS'])) { - - if (is_array($org_file)) { - $test_files[] = $org_file[1]; - } else { - $GLOBALS['test_files'] = $test_files; - find_files($IN_REDIRECT['TESTS']); - - foreach($GLOBALS['test_files'] as $f) { - $test_files[] = array($f, $file); - } - } - $test_cnt += @count($test_files) - 1; - $test_idx--; - - show_redirect_start($IN_REDIRECT['TESTS'], $tested, $tested_file); - - // set up environment - $redirenv = array_merge($environment, $IN_REDIRECT['ENV']); - $redirenv['REDIR_TEST_DIR'] = realpath($IN_REDIRECT['TESTS']) . DIRECTORY_SEPARATOR; - - usort($test_files, "test_sort"); - run_all_tests($test_files, $redirenv, $tested); - - show_redirect_ends($IN_REDIRECT['TESTS'], $tested, $tested_file); - - // a redirected test never fails - $IN_REDIRECT = false; - - junit_mark_test_as('PASS', $shortname, $tested); - return 'REDIR'; - - } else { - - $bork_info = "Redirect info must contain exactly one TEST string to be used as redirect directory."; - show_result("BORK", $bork_info, '', $temp_filenames); - $PHP_FAILED_TESTS['BORKED'][] = array ( - 'name' => $file, - 'test_name' => '', - 'output' => '', - 'diff' => '', - 'info' => "$bork_info [$file]", - ); - } - } - - if (is_array($org_file) || @count($section_text['REDIRECTTEST']) == 1) { - - if (is_array($org_file)) { - $file = $org_file[0]; - } - - $bork_info = "Redirected test did not contain redirection info"; - show_result("BORK", $bork_info, '', $temp_filenames); - $PHP_FAILED_TESTS['BORKED'][] = array ( - 'name' => $file, - 'test_name' => '', - 'output' => '', - 'diff' => '', - 'info' => "$bork_info [$file]", - ); - - junit_mark_test_as('BORK', $shortname, $tested, null, $bork_info); - - return 'BORKED'; - } - - // We've satisfied the preconditions - run the test! - if (isset($section_text['FILE'])) { - show_file_block('php', $section_text['FILE'], 'TEST'); - save_text($test_file, $section_text['FILE'], $temp_file); - } else { - $test_file = $temp_file = ""; - } - - if (array_key_exists('GET', $section_text)) { - $query_string = trim($section_text['GET']); - } else { - $query_string = ''; - } - - $env['REDIRECT_STATUS'] = '1'; - if (empty($env['QUERY_STRING'])) { - $env['QUERY_STRING'] = $query_string; - } - if (empty($env['PATH_TRANSLATED'])) { - $env['PATH_TRANSLATED'] = $test_file; - } - if (empty($env['SCRIPT_FILENAME'])) { - $env['SCRIPT_FILENAME'] = $test_file; - } - - if (array_key_exists('COOKIE', $section_text)) { - $env['HTTP_COOKIE'] = trim($section_text['COOKIE']); - } else { - $env['HTTP_COOKIE'] = ''; - } - - $args = isset($section_text['ARGS']) ? ' -- ' . $section_text['ARGS'] : ''; - - if (array_key_exists('POST_RAW', $section_text) && !empty($section_text['POST_RAW'])) { - - $post = trim($section_text['POST_RAW']); - $raw_lines = explode("\n", $post); - - $request = ''; - $started = false; - - foreach ($raw_lines as $line) { - - if (empty($env['CONTENT_TYPE']) && preg_match('/^Content-Type:(.*)/i', $line, $res)) { - $env['CONTENT_TYPE'] = trim(str_replace("\r", '', $res[1])); - continue; - } - - if ($started) { - $request .= "\n"; - } - - $started = true; - $request .= $line; - } - - $env['CONTENT_LENGTH'] = strlen($request); - $env['REQUEST_METHOD'] = 'POST'; - - if (empty($request)) { - junit_mark_test_as('BORK', $shortname, $tested, null, 'empty $request'); - return 'BORKED'; - } - - save_text($tmp_post, $request); - $cmd = "$php $pass_options $ini_settings -f \"$test_file\"$cmdRedirect < \"$tmp_post\""; - - } elseif (array_key_exists('PUT', $section_text) && !empty($section_text['PUT'])) { - - $post = trim($section_text['PUT']); - $raw_lines = explode("\n", $post); - - $request = ''; - $started = false; - - foreach ($raw_lines as $line) { - - if (empty($env['CONTENT_TYPE']) && preg_match('/^Content-Type:(.*)/i', $line, $res)) { - $env['CONTENT_TYPE'] = trim(str_replace("\r", '', $res[1])); - continue; - } - - if ($started) { - $request .= "\n"; - } - - $started = true; - $request .= $line; - } - - $env['CONTENT_LENGTH'] = strlen($request); - $env['REQUEST_METHOD'] = 'PUT'; - - if (empty($request)) { - junit_mark_test_as('BORK', $shortname, $tested, null, 'empty $request'); - return 'BORKED'; - } - - save_text($tmp_post, $request); - $cmd = "$php $pass_options $ini_settings -f \"$test_file\"$cmdRedirect < \"$tmp_post\""; - - } else if (array_key_exists('POST', $section_text) && !empty($section_text['POST'])) { - - $post = trim($section_text['POST']); - $content_length = strlen($post); - save_text($tmp_post, $post); - - $env['REQUEST_METHOD'] = 'POST'; - if (empty($env['CONTENT_TYPE'])) { - $env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'; - } - - if (empty($env['CONTENT_LENGTH'])) { - $env['CONTENT_LENGTH'] = $content_length; - } - - $cmd = "$php $pass_options $ini_settings -f \"$test_file\"$cmdRedirect < \"$tmp_post\""; - - } else if (array_key_exists('GZIP_POST', $section_text) && !empty($section_text['GZIP_POST'])) { - - $post = trim($section_text['GZIP_POST']); - $post = gzencode($post, 9, FORCE_GZIP); - $env['HTTP_CONTENT_ENCODING'] = 'gzip'; - - save_text($tmp_post, $post); - $content_length = strlen($post); - - $env['REQUEST_METHOD'] = 'POST'; - $env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'; - $env['CONTENT_LENGTH'] = $content_length; - - $cmd = "$php $pass_options $ini_settings -f \"$test_file\"$cmdRedirect < \"$tmp_post\""; - - } else if (array_key_exists('DEFLATE_POST', $section_text) && !empty($section_text['DEFLATE_POST'])) { - $post = trim($section_text['DEFLATE_POST']); - $post = gzcompress($post, 9); - $env['HTTP_CONTENT_ENCODING'] = 'deflate'; - save_text($tmp_post, $post); - $content_length = strlen($post); - - $env['REQUEST_METHOD'] = 'POST'; - $env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'; - $env['CONTENT_LENGTH'] = $content_length; - - $cmd = "$php $pass_options $ini_settings -f \"$test_file\"$cmdRedirect < \"$tmp_post\""; - - } else { - - $env['REQUEST_METHOD'] = 'GET'; - $env['CONTENT_TYPE'] = ''; - $env['CONTENT_LENGTH'] = ''; - - $cmd = "$php $pass_options $ini_settings -f \"$test_file\" $args$cmdRedirect"; - } - - if ($leak_check) { - $env['USE_ZEND_ALLOC'] = '0'; - $env['ZEND_DONT_UNLOAD_MODULES'] = 1; - - $valgrind_cmd = "valgrind -q --tool=memcheck --trace-children=yes"; - if (strpos($test_file, "pcre") !== false) { - $valgrind_cmd .= " --smc-check=all"; - } - - /* --vex-iropt-register-updates=allregs-at-mem-access is necessary for phpdbg watchpoint tests */ - if (version_compare($valgrind_version, '3.8.0', '>=')) { - /* valgrind 3.3.0+ doesn't have --log-file-exactly option */ - $cmd = "$valgrind_cmd --vex-iropt-register-updates=allregs-at-mem-access --log-file=$memcheck_filename $cmd"; - } elseif (version_compare($valgrind_version, '3.3.0', '>=')) { - $cmd = "$valgrind_cmd --vex-iropt-precise-memory-exns=yes --log-file=$memcheck_filename $cmd"; - } else { - $cmd = "$valgrind_cmd --vex-iropt-precise-memory-exns=yes --log-file-exactly=$memcheck_filename $cmd"; - } - - } else { - $env['USE_ZEND_ALLOC'] = '1'; - $env['ZEND_DONT_UNLOAD_MODULES'] = 0; - } - - if ($DETAILED) echo " -CONTENT_LENGTH = " . $env['CONTENT_LENGTH'] . " -CONTENT_TYPE = " . $env['CONTENT_TYPE'] . " -PATH_TRANSLATED = " . $env['PATH_TRANSLATED'] . " -QUERY_STRING = " . $env['QUERY_STRING'] . " -REDIRECT_STATUS = " . $env['REDIRECT_STATUS'] . " -REQUEST_METHOD = " . $env['REQUEST_METHOD'] . " -SCRIPT_FILENAME = " . $env['SCRIPT_FILENAME'] . " -HTTP_COOKIE = " . $env['HTTP_COOKIE'] . " -COMMAND $cmd -"; - - junit_start_timer($shortname); - $startTime = microtime(true); - - $out = system_with_timeout($cmd, $env, isset($section_text['STDIN']) ? $section_text['STDIN'] : null, $captureStdIn, $captureStdOut, $captureStdErr); - - junit_finish_timer($shortname); - $time = microtime(true) - $startTime; - if ($time * 1000 >= $slow_min_ms) { - $PHP_FAILED_TESTS['SLOW'][] = array( - 'name' => $file, - 'test_name' => (is_array($IN_REDIRECT) ? $IN_REDIRECT['via'] : '') . $tested . " [$tested_file]", - 'output' => '', - 'diff' => '', - 'info' => $time, - ); - } - - if (array_key_exists('CLEAN', $section_text) && (!$no_clean || $cfg['keep']['clean'])) { - - if (trim($section_text['CLEAN'])) { - show_file_block('clean', $section_text['CLEAN']); - save_text($test_clean, trim($section_text['CLEAN']), $temp_clean); - - if (!$no_clean) { - $clean_params = array(); - settings2array($ini_overwrites, $clean_params); - settings2params($clean_params); - $extra = substr(PHP_OS, 0, 3) !== "WIN" ? - "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": ""; - system_with_timeout("$extra $php $pass_options -q $clean_params $no_file_cache \"$test_clean\"", $env); - } - - if (!$cfg['keep']['clean']) { - @unlink($test_clean); - } - } - } - - @unlink($tmp_post); - - $leaked = false; - $passed = false; - - if ($leak_check) { // leak check - $leaked = filesize($memcheck_filename) > 0; - - if (!$leaked) { - @unlink($memcheck_filename); - } - } - - // Does the output match what is expected? - $output = preg_replace("/\r\n/", "\n", trim($out)); - - /* when using CGI, strip the headers from the output */ - $headers = array(); - - if (!empty($uses_cgi) && preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $out, $match)) { - $output = trim($match[2]); - $rh = preg_split("/[\n\r]+/", $match[1]); - - foreach ($rh as $line) { - if (strpos($line, ':') !== false) { - $line = explode(':', $line, 2); - $headers[trim($line[0])] = trim($line[1]); - } - } - } - - $failed_headers = false; - - if (isset($section_text['EXPECTHEADERS'])) { - $want = array(); - $wanted_headers = array(); - $lines = preg_split("/[\n\r]+/", $section_text['EXPECTHEADERS']); - - foreach($lines as $line) { - if (strpos($line, ':') !== false) { - $line = explode(':', $line, 2); - $want[trim($line[0])] = trim($line[1]); - $wanted_headers[] = trim($line[0]) . ': ' . trim($line[1]); - } - } - - $output_headers = array(); - - foreach($want as $k => $v) { - - if (isset($headers[$k])) { - $output_headers[] = $k . ': ' . $headers[$k]; - } - - if (!isset($headers[$k]) || $headers[$k] != $v) { - $failed_headers = true; - } - } - - ksort($wanted_headers); - $wanted_headers = implode("\n", $wanted_headers); - ksort($output_headers); - $output_headers = implode("\n", $output_headers); - } - - show_file_block('out', $output); - - if (isset($section_text['EXPECTF']) || isset($section_text['EXPECTREGEX'])) { - - if (isset($section_text['EXPECTF'])) { - $wanted = trim($section_text['EXPECTF']); - } else { - $wanted = trim($section_text['EXPECTREGEX']); - } - - show_file_block('exp', $wanted); - $wanted_re = preg_replace('/\r\n/', "\n", $wanted); - - if (isset($section_text['EXPECTF'])) { - - // do preg_quote, but miss out any %r delimited sections - $temp = ""; - $r = "%r"; - $startOffset = 0; - $length = strlen($wanted_re); - while($startOffset < $length) { - $start = strpos($wanted_re, $r, $startOffset); - if ($start !== false) { - // we have found a start tag - $end = strpos($wanted_re, $r, $start+2); - if ($end === false) { - // unbalanced tag, ignore it. - $end = $start = $length; - } - } else { - // no more %r sections - $start = $end = $length; - } - // quote a non re portion of the string - $temp = $temp . preg_quote(substr($wanted_re, $startOffset, ($start - $startOffset)), '/'); - // add the re unquoted. - if ($end > $start) { - $temp = $temp . '(' . substr($wanted_re, $start+2, ($end - $start-2)). ')'; - } - $startOffset = $end + 2; - } - $wanted_re = $temp; - - $wanted_re = str_replace( - array('%binary_string_optional%'), - 'string', - $wanted_re - ); - $wanted_re = str_replace( - array('%unicode_string_optional%'), - 'string', - $wanted_re - ); - $wanted_re = str_replace( - array('%unicode\|string%', '%string\|unicode%'), - 'string', - $wanted_re - ); - $wanted_re = str_replace( - array('%u\|b%', '%b\|u%'), - '', - $wanted_re - ); - // Stick to basics - $wanted_re = str_replace('%e', '\\' . DIRECTORY_SEPARATOR, $wanted_re); - $wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re); - $wanted_re = str_replace('%S', '[^\r\n]*', $wanted_re); - $wanted_re = str_replace('%a', '.+', $wanted_re); - $wanted_re = str_replace('%A', '.*', $wanted_re); - $wanted_re = str_replace('%w', '\s*', $wanted_re); - $wanted_re = str_replace('%i', '[+-]?\d+', $wanted_re); - $wanted_re = str_replace('%d', '\d+', $wanted_re); - $wanted_re = str_replace('%x', '[0-9a-fA-F]+', $wanted_re); - $wanted_re = str_replace('%f', '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', $wanted_re); - $wanted_re = str_replace('%c', '.', $wanted_re); - // %f allows two points "-.0.0" but that is the best *simple* expression - } -/* DEBUG YOUR REGEX HERE - var_dump($wanted_re); - print(str_repeat('=', 80) . "\n"); - var_dump($output); -*/ - if (preg_match("/^$wanted_re\$/s", $output)) { - $passed = true; - if (!$cfg['keep']['php']) { - @unlink($test_file); - } - - if (!$leaked && !$failed_headers) { - if (isset($section_text['XFAIL'] )) { - $warn = true; - $info = " (warn: XFAIL section but test passes)"; - }else { - show_result("PASS", $tested, $tested_file, '', $temp_filenames); - junit_mark_test_as('PASS', $shortname, $tested); - return 'PASSED'; - } - } - } - - } else { - - $wanted = trim($section_text['EXPECT']); - $wanted = preg_replace('/\r\n/',"\n", $wanted); - show_file_block('exp', $wanted); - - // compare and leave on success - if (!strcmp($output, $wanted)) { - $passed = true; - - if (!$cfg['keep']['php']) { - @unlink($test_file); - } - - if (!$leaked && !$failed_headers) { - if (isset($section_text['XFAIL'] )) { - $warn = true; - $info = " (warn: XFAIL section but test passes)"; - }else { - show_result("PASS", $tested, $tested_file, '', $temp_filenames); - junit_mark_test_as('PASS', $shortname, $tested); - return 'PASSED'; - } - } - } - - $wanted_re = null; - } - - // Test failed so we need to report details. - if ($failed_headers) { - $passed = false; - $wanted = $wanted_headers . "\n--HEADERS--\n" . $wanted; - $output = $output_headers . "\n--HEADERS--\n" . $output; - - if (isset($wanted_re)) { - $wanted_re = preg_quote($wanted_headers . "\n--HEADERS--\n", '/') . $wanted_re; - } - } - - if ($leaked) { - $restype[] = 'LEAK'; - } - - if ($warn) { - $restype[] = 'WARN'; - } - - if (!$passed) { - if (isset($section_text['XFAIL'])) { - $restype[] = 'XFAIL'; - $info = ' XFAIL REASON: ' . rtrim($section_text['XFAIL']); - } else { - $restype[] = 'FAIL'; - } - } - - if (!$passed) { - - // write .exp - if (strpos($log_format, 'E') !== false && file_put_contents($exp_filename, $wanted, FILE_BINARY) === false) { - error("Cannot create expected test output - $exp_filename"); - } - - // write .out - if (strpos($log_format, 'O') !== false && file_put_contents($output_filename, $output, FILE_BINARY) === false) { - error("Cannot create test output - $output_filename"); - } - - // write .diff - $diff = generate_diff($wanted, $wanted_re, $output); - if (is_array($IN_REDIRECT)) { - $diff = "# original source file: $shortname\n" . $diff; - } - show_file_block('diff', $diff); - if (strpos($log_format, 'D') !== false && file_put_contents($diff_filename, $diff, FILE_BINARY) === false) { - error("Cannot create test diff - $diff_filename"); - } - - // write .sh - if (strpos($log_format, 'S') !== false && file_put_contents($sh_filename, "#!/bin/sh - -{$cmd} -", FILE_BINARY) === false) { - error("Cannot create test shell script - $sh_filename"); - } - chmod($sh_filename, 0755); - - // write .log - if (strpos($log_format, 'L') !== false && file_put_contents($log_filename, " ----- EXPECTED OUTPUT -$wanted ----- ACTUAL OUTPUT -$output ----- FAILED -", FILE_BINARY) === false) { - error("Cannot create test log - $log_filename"); - error_report($file, $log_filename, $tested); - } - } - - show_result(implode('&', $restype), $tested, $tested_file, $info, $temp_filenames); - - foreach ($restype as $type) { - $PHP_FAILED_TESTS[$type.'ED'][] = array ( - 'name' => $file, - 'test_name' => (is_array($IN_REDIRECT) ? $IN_REDIRECT['via'] : '') . $tested . " [$tested_file]", - 'output' => $output_filename, - 'diff' => $diff_filename, - 'info' => $info, - ); - } - - $diff = empty($diff) ? '' : preg_replace('/\e/', '', $diff); - - junit_mark_test_as($restype, str_replace($cwd . '/', '', $tested_file), $tested, null, $info, $diff); - - return $restype[0] . 'ED'; -} - -function comp_line($l1, $l2, $is_reg) -{ - if ($is_reg) { - return preg_match('/^'. $l1 . '$/s', $l2); - } else { - return !strcmp($l1, $l2); - } -} - -function count_array_diff($ar1, $ar2, $is_reg, $w, $idx1, $idx2, $cnt1, $cnt2, $steps) -{ - $equal = 0; - - while ($idx1 < $cnt1 && $idx2 < $cnt2 && comp_line($ar1[$idx1], $ar2[$idx2], $is_reg)) { - $idx1++; - $idx2++; - $equal++; - $steps--; - } - if (--$steps > 0) { - $eq1 = 0; - $st = $steps / 2; - - for ($ofs1 = $idx1 + 1; $ofs1 < $cnt1 && $st-- > 0; $ofs1++) { - $eq = @count_array_diff($ar1, $ar2, $is_reg, $w, $ofs1, $idx2, $cnt1, $cnt2, $st); - - if ($eq > $eq1) { - $eq1 = $eq; - } - } - - $eq2 = 0; - $st = $steps; - - for ($ofs2 = $idx2 + 1; $ofs2 < $cnt2 && $st-- > 0; $ofs2++) { - $eq = @count_array_diff($ar1, $ar2, $is_reg, $w, $idx1, $ofs2, $cnt1, $cnt2, $st); - if ($eq > $eq2) { - $eq2 = $eq; - } - } - - if ($eq1 > $eq2) { - $equal += $eq1; - } else if ($eq2 > 0) { - $equal += $eq2; - } - } - - return $equal; -} - -function generate_array_diff($ar1, $ar2, $is_reg, $w) -{ - $idx1 = 0; $cnt1 = @count($ar1); - $idx2 = 0; $cnt2 = @count($ar2); - $diff = array(); - $old1 = array(); - $old2 = array(); - - while ($idx1 < $cnt1 && $idx2 < $cnt2) { - - if (comp_line($ar1[$idx1], $ar2[$idx2], $is_reg)) { - $idx1++; - $idx2++; - continue; - } else { - - $c1 = @count_array_diff($ar1, $ar2, $is_reg, $w, $idx1+1, $idx2, $cnt1, $cnt2, 10); - $c2 = @count_array_diff($ar1, $ar2, $is_reg, $w, $idx1, $idx2+1, $cnt1, $cnt2, 10); - - if ($c1 > $c2) { - $old1[$idx1] = sprintf("%03d- ", $idx1+1) . $w[$idx1++]; - } else if ($c2 > 0) { - $old2[$idx2] = sprintf("%03d+ ", $idx2+1) . $ar2[$idx2++]; - } else { - $old1[$idx1] = sprintf("%03d- ", $idx1+1) . $w[$idx1++]; - $old2[$idx2] = sprintf("%03d+ ", $idx2+1) . $ar2[$idx2++]; - } - } - } - - reset($old1); $k1 = key($old1); $l1 = -2; - reset($old2); $k2 = key($old2); $l2 = -2; - - while ($k1 !== null || $k2 !== null) { - - if ($k1 == $l1 + 1 || $k2 === null) { - $l1 = $k1; - $diff[] = current($old1); - $k1 = next($old1) ? key($old1) : null; - } else if ($k2 == $l2 + 1 || $k1 === null) { - $l2 = $k2; - $diff[] = current($old2); - $k2 = next($old2) ? key($old2) : null; - } else if ($k1 < $k2) { - $l1 = $k1; - $diff[] = current($old1); - $k1 = next($old1) ? key($old1) : null; - } else { - $l2 = $k2; - $diff[] = current($old2); - $k2 = next($old2) ? key($old2) : null; - } - } - - while ($idx1 < $cnt1) { - $diff[] = sprintf("%03d- ", $idx1 + 1) . $w[$idx1++]; - } - - while ($idx2 < $cnt2) { - $diff[] = sprintf("%03d+ ", $idx2 + 1) . $ar2[$idx2++]; - } - - return $diff; -} - -function generate_diff($wanted, $wanted_re, $output) -{ - $w = explode("\n", $wanted); - $o = explode("\n", $output); - $r = is_null($wanted_re) ? $w : explode("\n", $wanted_re); - $diff = generate_array_diff($r, $o, !is_null($wanted_re), $w); - - return implode("\r\n", $diff); -} - -function error($message) -{ - echo "ERROR: {$message}\n"; - exit(1); -} - -function settings2array($settings, &$ini_settings) -{ - foreach($settings as $setting) { - - if (strpos($setting, '=') !== false) { - $setting = explode("=", $setting, 2); - $name = trim($setting[0]); - $value = trim($setting[1]); - - if ($name == 'extension' || $name == 'zend_extension') { - - if (!isset($ini_settings[$name])) { - $ini_settings[$name] = array(); - } - - $ini_settings[$name][] = $value; - - } else { - $ini_settings[$name] = $value; - } - } - } -} - -function settings2params(&$ini_settings) -{ - $settings = ''; - - foreach($ini_settings as $name => $value) { - - if (is_array($value)) { - foreach($value as $val) { - $val = addslashes($val); - $settings .= " -d \"$name=$val\""; - } - } else { - if (substr(PHP_OS, 0, 3) == "WIN" && !empty($value) && $value{0} == '"') { - $len = strlen($value); - - if ($value{$len - 1} == '"') { - $value{0} = "'"; - $value{$len - 1} = "'"; - } - } else { - $value = addslashes($value); - } - - $settings .= " -d \"$name=$value\""; - } - } - - $ini_settings = $settings; -} - -function compute_summary() -{ - global $n_total, $test_results, $ignored_by_ext, $sum_results, $percent_results; - - $n_total = count($test_results); - $n_total += $ignored_by_ext; - $sum_results = array( - 'PASSED' => 0, - 'WARNED' => 0, - 'SKIPPED' => 0, - 'FAILED' => 0, - 'BORKED' => 0, - 'LEAKED' => 0, - 'XFAILED' => 0 - ); - - foreach ($test_results as $v) { - $sum_results[$v]++; - } - - $sum_results['SKIPPED'] += $ignored_by_ext; - $percent_results = array(); - - foreach ($sum_results as $v => $n) { - $percent_results[$v] = (100.0 * $n) / $n_total; - } -} - -function get_summary($show_ext_summary, $show_html) -{ - global $exts_skipped, $exts_tested, $n_total, $sum_results, $percent_results, $end_time, $start_time, $failed_test_summary, $PHP_FAILED_TESTS, $leak_check; - - $x_total = $n_total - $sum_results['SKIPPED'] - $sum_results['BORKED']; - - if ($x_total) { - $x_warned = (100.0 * $sum_results['WARNED']) / $x_total; - $x_failed = (100.0 * $sum_results['FAILED']) / $x_total; - $x_xfailed = (100.0 * $sum_results['XFAILED']) / $x_total; - $x_leaked = (100.0 * $sum_results['LEAKED']) / $x_total; - $x_passed = (100.0 * $sum_results['PASSED']) / $x_total; - } else { - $x_warned = $x_failed = $x_passed = $x_leaked = $x_xfailed = 0; - } - - $summary = ''; - - if ($show_html) { - $summary .= "
\n";
-	}
-
-	if ($show_ext_summary) {
-		$summary .= '
-=====================================================================
-TEST RESULT SUMMARY
----------------------------------------------------------------------
-Exts skipped    : ' . sprintf('%4d', $exts_skipped) . '
-Exts tested     : ' . sprintf('%4d', $exts_tested) . '
----------------------------------------------------------------------
-';
-	}
-
-	$summary .= '
-Number of tests : ' . sprintf('%4d', $n_total) . '          ' . sprintf('%8d', $x_total);
-
-	if ($sum_results['BORKED']) {
-		$summary .= '
-Tests borked    : ' . sprintf('%4d (%5.1f%%)', $sum_results['BORKED'], $percent_results['BORKED']) . ' --------';
-	}
-
-	$summary .= '
-Tests skipped   : ' . sprintf('%4d (%5.1f%%)', $sum_results['SKIPPED'], $percent_results['SKIPPED']) . ' --------
-Tests warned    : ' . sprintf('%4d (%5.1f%%)', $sum_results['WARNED'], $percent_results['WARNED']) . ' ' . sprintf('(%5.1f%%)', $x_warned) . '
-Tests failed    : ' . sprintf('%4d (%5.1f%%)', $sum_results['FAILED'], $percent_results['FAILED']) . ' ' . sprintf('(%5.1f%%)', $x_failed) . '
-Expected fail   : ' . sprintf('%4d (%5.1f%%)', $sum_results['XFAILED'], $percent_results['XFAILED']) . ' ' . sprintf('(%5.1f%%)', $x_xfailed);
-
-	if ($leak_check) {
-		$summary .= '
-Tests leaked    : ' . sprintf('%4d (%5.1f%%)', $sum_results['LEAKED'], $percent_results['LEAKED']) . ' ' . sprintf('(%5.1f%%)', $x_leaked);
-	}
-
-	$summary .= '
-Tests passed    : ' . sprintf('%4d (%5.1f%%)', $sum_results['PASSED'], $percent_results['PASSED']) . ' ' . sprintf('(%5.1f%%)', $x_passed) . '
----------------------------------------------------------------------
-Time taken      : ' . sprintf('%4d seconds', $end_time - $start_time) . '
-=====================================================================
-';
-	$failed_test_summary = '';
-
-	if (count($PHP_FAILED_TESTS['SLOW'])) {
-		usort($PHP_FAILED_TESTS['SLOW'], function($a, $b) {
-			return $a['info'] < $b['info'] ? 1 : -1;
-		});
-
-		$failed_test_summary .= '
-=====================================================================
-SLOW TEST SUMMARY
----------------------------------------------------------------------
-';
-		foreach ($PHP_FAILED_TESTS['SLOW'] as $failed_test_data) {
-			$failed_test_summary .= sprintf('(%.3f s) ', $failed_test_data['info']) . $failed_test_data['test_name'] . "\n";
-		}
-		$failed_test_summary .=  "=====================================================================\n";
-	}
-
-	if (count($PHP_FAILED_TESTS['XFAILED'])) {
-		$failed_test_summary .= '
-=====================================================================
-EXPECTED FAILED TEST SUMMARY
----------------------------------------------------------------------
-';
-		foreach ($PHP_FAILED_TESTS['XFAILED'] as $failed_test_data) {
-			$failed_test_summary .= $failed_test_data['test_name'] . $failed_test_data['info'] . "\n";
-		}
-		$failed_test_summary .=  "=====================================================================\n";
-	}
-
-	if (count($PHP_FAILED_TESTS['BORKED'])) {
-		$failed_test_summary .= '
-=====================================================================
-BORKED TEST SUMMARY
----------------------------------------------------------------------
-';
-		foreach ($PHP_FAILED_TESTS['BORKED'] as $failed_test_data) {
-			$failed_test_summary .= $failed_test_data['info'] . "\n";
-		}
-
-		$failed_test_summary .=  "=====================================================================\n";
-	}
-
-	if (count($PHP_FAILED_TESTS['FAILED'])) {
-		$failed_test_summary .= '
-=====================================================================
-FAILED TEST SUMMARY
----------------------------------------------------------------------
-';
-		foreach ($PHP_FAILED_TESTS['FAILED'] as $failed_test_data) {
-			$failed_test_summary .= $failed_test_data['test_name'] . $failed_test_data['info'] . "\n";
-		}
-		$failed_test_summary .=  "=====================================================================\n";
-	}
-	if (count($PHP_FAILED_TESTS['WARNED'])) {
-		$failed_test_summary .= '
-=====================================================================
-WARNED TEST SUMMARY
----------------------------------------------------------------------
-';
-		foreach ($PHP_FAILED_TESTS['WARNED'] as $failed_test_data) {
-			$failed_test_summary .= $failed_test_data['test_name'] . $failed_test_data['info'] . "\n";
-		}
-
-		$failed_test_summary .=  "=====================================================================\n";
-	}
-
-	if (count($PHP_FAILED_TESTS['LEAKED'])) {
-		$failed_test_summary .= '
-=====================================================================
-LEAKED TEST SUMMARY
----------------------------------------------------------------------
-';
-		foreach ($PHP_FAILED_TESTS['LEAKED'] as $failed_test_data) {
-			$failed_test_summary .= $failed_test_data['test_name'] . $failed_test_data['info'] . "\n";
-		}
-
-		$failed_test_summary .=  "=====================================================================\n";
-	}
-
-	if ($failed_test_summary && !getenv('NO_PHPTEST_SUMMARY')) {
-		$summary .= $failed_test_summary;
-	}
-
-	if ($show_html) {
-		$summary .= "
"; - } - - return $summary; -} - -function show_start($start_time) -{ - global $html_output, $html_file; - - if ($html_output) { - fwrite($html_file, "

Time Start: " . date('Y-m-d H:i:s', $start_time) . "

\n"); - fwrite($html_file, "\n"); - } - - echo "TIME START " . date('Y-m-d H:i:s', $start_time) . "\n=====================================================================\n"; -} - -function show_end($end_time) -{ - global $html_output, $html_file; - - if ($html_output) { - fwrite($html_file, "
\n"); - fwrite($html_file, "

Time End: " . date('Y-m-d H:i:s', $end_time) . "

\n"); - } - - echo "=====================================================================\nTIME END " . date('Y-m-d H:i:s', $end_time) . "\n"; -} - -function show_summary() -{ - global $html_output, $html_file; - - if ($html_output) { - fwrite($html_file, "
\n" . get_summary(true, true)); - } - - echo get_summary(true, false); -} - -function show_redirect_start($tests, $tested, $tested_file) -{ - global $html_output, $html_file, $line_length, $SHOW_ONLY_GROUPS; - - if ($html_output) { - fwrite($html_file, "---> $tests ($tested [$tested_file]) begin\n"); - } - - if (!$SHOW_ONLY_GROUPS || in_array('REDIRECT', $SHOW_ONLY_GROUPS)) { - echo "REDIRECT $tests ($tested [$tested_file]) begin\n"; - } else { - // Write over the last line to avoid random trailing chars on next echo - echo str_repeat(" ", $line_length), "\r"; - } -} - -function show_redirect_ends($tests, $tested, $tested_file) -{ - global $html_output, $html_file, $line_length, $SHOW_ONLY_GROUPS; - - if ($html_output) { - fwrite($html_file, "---> $tests ($tested [$tested_file]) done\n"); - } - - if (!$SHOW_ONLY_GROUPS || in_array('REDIRECT', $SHOW_ONLY_GROUPS)) { - echo "REDIRECT $tests ($tested [$tested_file]) done\n"; - } else { - // Write over the last line to avoid random trailing chars on next echo - echo str_repeat(" ", $line_length), "\r"; - } -} - -function show_test($test_idx, $shortname) -{ - global $test_cnt; - global $line_length; - - $str = "TEST $test_idx/$test_cnt [$shortname]\r"; - $line_length = strlen($str); - echo $str; - flush(); -} - -function show_result($result, $tested, $tested_file, $extra = '', $temp_filenames = null) -{ - global $html_output, $html_file, $temp_target, $temp_urlbase, $line_length, $SHOW_ONLY_GROUPS; - - if (!$SHOW_ONLY_GROUPS || in_array($result, $SHOW_ONLY_GROUPS)) { - echo "$result $tested [$tested_file] $extra\n"; - } else if (!$SHOW_ONLY_GROUPS) { - // Write over the last line to avoid random trailing chars on next echo - echo str_repeat(" ", $line_length), "\r"; - } - - if ($html_output) { - - if (isset($temp_filenames['file']) && file_exists($temp_filenames['file'])) { - $url = str_replace($temp_target, $temp_urlbase, $temp_filenames['file']); - $tested = "$tested"; - } - - if (isset($temp_filenames['skip']) && file_exists($temp_filenames['skip'])) { - - if (empty($extra)) { - $extra = "skipif"; - } - - $url = str_replace($temp_target, $temp_urlbase, $temp_filenames['skip']); - $extra = "$extra"; - - } else if (empty($extra)) { - $extra = " "; - } - - if (isset($temp_filenames['diff']) && file_exists($temp_filenames['diff'])) { - $url = str_replace($temp_target, $temp_urlbase, $temp_filenames['diff']); - $diff = "diff"; - } else { - $diff = " "; - } - - if (isset($temp_filenames['mem']) && file_exists($temp_filenames['mem'])) { - $url = str_replace($temp_target, $temp_urlbase, $temp_filenames['mem']); - $mem = "leaks"; - } else { - $mem = " "; - } - - fwrite($html_file, - "" . - "$result" . - "$tested" . - "$extra" . - "$diff" . - "$mem" . - "\n"); - } -} - -function junit_init() { - // Check whether a junit log is wanted. - $JUNIT = getenv('TEST_PHP_JUNIT'); - if (empty($JUNIT)) { - $JUNIT = FALSE; - } elseif (!$fp = fopen($JUNIT, 'w')) { - error("Failed to open $JUNIT for writing."); - } else { - $JUNIT = array( - 'fp' => $fp, - 'name' => 'php-src', - 'test_total' => 0, - 'test_pass' => 0, - 'test_fail' => 0, - 'test_error' => 0, - 'test_skip' => 0, - 'test_warn' => 0, - 'execution_time'=> 0, - 'suites' => array(), - 'files' => array() - ); - } - - $GLOBALS['JUNIT'] = $JUNIT; -} - -function junit_save_xml() { - global $JUNIT; - if (!junit_enabled()) return; - - $xml = ''. PHP_EOL . - '' . PHP_EOL; - $xml .= junit_get_suite_xml(); - $xml .= ''; - fwrite($JUNIT['fp'], $xml); -} - -function junit_get_suite_xml($suite_name = '') { - global $JUNIT; - - $suite = $suite_name ? $JUNIT['suites'][$suite_name] : $JUNIT; - - $result = sprintf( - '' . PHP_EOL, - $suite['name'], $suite['test_total'], $suite['test_fail'], $suite['test_error'], $suite['test_skip'], - $suite['execution_time'] - ); - - foreach($suite['suites'] as $sub_suite) { - $result .= junit_get_suite_xml($sub_suite['name']); - } - - // Output files only in subsuites - if (!empty($suite_name)) { - foreach($suite['files'] as $file) { - $result .= $JUNIT['files'][$file]['xml']; - } - } - - $result .= '' . PHP_EOL; - - return $result; -} - -function junit_enabled() { - global $JUNIT; - return !empty($JUNIT); -} - -/** - * @param array|string $type - * @param string $file_name - * @param string $test_name - * @param int|string $time - * @param string $message - * @param string $details - * @return void - */ -function junit_mark_test_as($type, $file_name, $test_name, $time = null, $message = '', $details = '') { - global $JUNIT; - if (!junit_enabled()) return; - - $suite = junit_get_suitename_for($file_name); - - junit_suite_record($suite, 'test_total'); - - $time = null !== $time ? $time : junit_get_timer($file_name); - junit_suite_record($suite, 'execution_time', $time); - - $escaped_details = htmlspecialchars($details, ENT_QUOTES, 'UTF-8'); - $escaped_details = preg_replace_callback('/[\0-\x08\x0B\x0C\x0E-\x1F]/', function ($c) { - return sprintf('[[0x%02x]]', ord($c[0])); - }, $escaped_details); - $escaped_message = htmlspecialchars($message, ENT_QUOTES, 'UTF-8'); - - $escaped_test_name = basename($file_name) . ' - ' . htmlspecialchars($test_name, ENT_QUOTES); - $JUNIT['files'][$file_name]['xml'] = "\n"; - - if (is_array($type)) { - $output_type = $type[0] . 'ED'; - $temp = array_intersect(array('XFAIL', 'FAIL', 'WARN'), $type); - $type = reset($temp); - } else { - $output_type = $type . 'ED'; - } - - if ('PASS' == $type || 'XFAIL' == $type) { - junit_suite_record($suite, 'test_pass'); - } elseif ('BORK' == $type) { - junit_suite_record($suite, 'test_error'); - $JUNIT['files'][$file_name]['xml'] .= "\n"; - } elseif ('SKIP' == $type) { - junit_suite_record($suite, 'test_skip'); - $JUNIT['files'][$file_name]['xml'] .= "$escaped_message\n"; - } elseif ('WARN' == $type) { - junit_suite_record($suite, 'test_warn'); - $JUNIT['files'][$file_name]['xml'] .= "$escaped_message\n"; - } elseif ('FAIL' == $type) { - junit_suite_record($suite, 'test_fail'); - $JUNIT['files'][$file_name]['xml'] .= "$escaped_details\n"; - } else { - junit_suite_record($suite, 'test_error'); - $JUNIT['files'][$file_name]['xml'] .= "$escaped_details\n"; - } - - $JUNIT['files'][$file_name]['xml'] .= "\n"; - -} - -function junit_suite_record($suite, $param, $value = 1) { - global $JUNIT; - - $JUNIT[$param] += $value; - $JUNIT['suites'][$suite][$param] += $value; -} - -function junit_get_timer($file_name) { - global $JUNIT; - if (!junit_enabled()) return 0; - - if (isset($JUNIT['files'][$file_name]['total'])) { - return number_format($JUNIT['files'][$file_name]['total'], 4); - } - - return 0; -} - -function junit_start_timer($file_name) { - global $JUNIT; - if (!junit_enabled()) return; - - if (!isset($JUNIT['files'][$file_name]['start'])) { - $JUNIT['files'][$file_name]['start'] = microtime(true); - - $suite = junit_get_suitename_for($file_name); - junit_init_suite($suite); - $JUNIT['suites'][$suite]['files'][$file_name] = $file_name; - } -} - -function junit_get_suitename_for($file_name) { - return junit_path_to_classname(dirname($file_name)); -} - -function junit_path_to_classname($file_name) { - global $JUNIT; - return $JUNIT['name'] . '.' . str_replace(DIRECTORY_SEPARATOR, '.', $file_name); -} - -function junit_init_suite($suite_name) { - global $JUNIT; - if (!junit_enabled()) return; - - if (!empty($JUNIT['suites'][$suite_name])) { - return; - } - - $JUNIT['suites'][$suite_name] = array( - 'name' => $suite_name, - 'test_total' => 0, - 'test_pass' => 0, - 'test_fail' => 0, - 'test_error' => 0, - 'test_skip' => 0, - 'suites' => array(), - 'files' => array(), - 'execution_time'=> 0, - ); -} - -function junit_finish_timer($file_name) { - global $JUNIT; - if (!junit_enabled()) return; - - if (!isset($JUNIT['files'][$file_name]['start'])) { - error("Timer for $file_name was not started!"); - } - - if (!isset($JUNIT['files'][$file_name]['total'])) { - $JUNIT['files'][$file_name]['total'] = 0; - } - - $start = $JUNIT['files'][$file_name]['start']; - $JUNIT['files'][$file_name]['total'] += microtime(true) - $start; - unset($JUNIT['files'][$file_name]['start']); -} - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim: noet sw=4 ts=4 - */ -?> diff --git a/run.sh b/run.sh deleted file mode 100755 index 5cd28b2..0000000 --- a/run.sh +++ /dev/null @@ -1,300 +0,0 @@ -#!/usr/bin/env bash - -### BEGIN ### -# Author: idevz -# Since: 2018/03/12 -# Description: Auto genertate PHPUnit Tests and phpt tests. -# ./run.sh see help -### END ### - -set -ex - -BASE_DIR=$(dirname $(cd $(dirname "$0") && pwd -P)/$(basename "$0")) -PHPUNIT_SKELGEN_EXECUTABLE=/usr/local/bin/phpunit-skelgen -PHPUNIT_EXECUTABLE=${BASE_DIR}/vendor/bin/phpunit -PHPUNIT_TEST_BOOT_STRAP=${BASE_DIR}/tests/bootstrap.php - -PHPT_SKELGEN_EXECUTABLE=${BASE_DIR}/phpts/generate-phpt -PHPT_EXECUTABLE=${BASE_DIR}/phpts/run-tests.php -# https://qa.php.net/phpt_details.php check phpt sections detail -DEFAULT_PHPT_SECTIONS='skipif:ini:clean:done' -PHPT_SECTIONS=${PTSEC:-${DEFAULT_PHPT_SECTIONS}} - -MESH_TESTHELPER_IMAGE=${MIMG:-"zhoujing/wm-testhelper:1.0.1"} -MESH_CONTAINER_NAME=${MCTNAME:-"mesh-testhelper"} -MEHS_RUN_PATH=${MRUN_PATH:-"${BASE_DIR}/weibo-mesh-runpath"} - -MESH_MC_CONTAINER_NAME="mesh-test-mc" -MESH_ZK_CONTAINER_NAME="mesh-test-zk" - -PHP_IMAGE=${PIMG:-"zhoujing/idevz-runx-php:7.3.2"} - -new_ptest_4_cls_method() { - local PHP_EXECUTABLE=$(which php) - - local CLASS_FILE="${BASE_DIR}/phpts/bootstrap.php" - local CLASS_NAME=$1 - local METHOD_NAME=$2 - local PHPT_FILE_NAME=$(echo ${CLASS_NAME} | sed 's/\\/_/g')/${METHOD_NAME}_basic.phpt - ${PHP_EXECUTABLE} -d output_buffering=0 -d memory_limit=-1 \ - -d auto_prepend_file=${CLASS_FILE} \ - ${PHPT_SKELGEN_EXECUTABLE} \ - -c ${CLASS_NAME} -m ${METHOD_NAME} \ - -b -s ${PHPT_SECTIONS} - mkdir -p $(dirname $BASE_DIR/phpts/${PHPT_FILE_NAME}) - mv ${CLASS_NAME}_${METHOD_NAME}_basic.phpt $BASE_DIR/phpts/${PHPT_FILE_NAME} -} - -new_ptest_4_func_in_file() { - local PHP_EXECUTABLE=$(which php) - - local SRC_FILE=$1 - local FUNC_NAME=$2 - local PHPT_FILE_NAME=${FUNC_NAME}_basic.phpt - ${PHP_EXECUTABLE} -d open_basedir= -d output_buffering=0 -d memory_limit=-1 \ - -d auto_prepend_file=${SRC_FILE} \ - ${PHPT_SKELGEN_EXECUTABLE} \ - -f ${FUNC_NAME} \ - -b -s ${PHPT_SECTIONS} - mv ${PHPT_FILE_NAME} $BASE_DIR/phpts/${PHPT_FILE_NAME} -} - -run_ptests() { - local phpts_dir="${BASE_DIR}/phpts" - [ ! -z ${1} ] && phpts_dir=${1} - TEST_PHP_EXECUTABLE=$(which php) ${PHPT_EXECUTABLE} ${phpts_dir} -} - -new_utest() { - local CLASS_FILE=$1 - local CLASS_NAME=$(echo $CLASS_FILE | sed "s/\//\\\\/g" | sed "s/\.php//g") - local TEST_CLASS_FILE=$(echo $CLASS_FILE | sed "s/\.php/Test\.php/g") - ${PHPUNIT_SKELGEN_EXECUTABLE} generate-test \ - --bootstrap=${TEST_BOOT_STRAP} ${CLASS_NAME} \ - ${BASE_DIR}/src/${CLASS_FILE} \ - ${CLASS_NAME}Test \ - ${BASE_DIR}/tests/${TEST_CLASS_FILE} - - local NAME_SPACE=$( - cat ${BASE_DIR}/tests/${TEST_CLASS_FILE} | - grep "namespace" | sed 's/namespace \(.*\);/\1/g' | - sed 's/\\/\\\\/g' - )'\\' - if [ "$(uname -s)" = 'Darwin' ]; then - sed -i '' 's/PHPUnit_Framework_TestCase/PHPUnit\\Framework\\TestCase/g' ${BASE_DIR}/tests/${TEST_CLASS_FILE} && - sed -i '' 's/ Motan\\/ \\Motan\\/g' ${BASE_DIR}/tests/${TEST_CLASS_FILE} && - sed -i '' "s/ ${NAME_SPACE}/ \\${NAME_SPACE}/g" ${BASE_DIR}/tests/${TEST_CLASS_FILE} - else - sed -i 's/PHPUnit_Framework_TestCase/PHPUnit\\Framework\\TestCase/g' ${BASE_DIR}/tests/${TEST_CLASS_FILE} && - sed -i 's/ Motan\\/ \\Motan\\/g' ${BASE_DIR}/tests/${TEST_CLASS_FILE} && - sed -i "s/ ${NAME_SPACE}/ \\${NAME_SPACE}/g" ${BASE_DIR}/tests/${TEST_CLASS_FILE} - fi -} - -new_all_utests() { - for file in $(ls $1); do - local SRC_FILE_OR_DIR=$1"/"${file} - local BASE_SRC=${BASE_DIR}/src/ - if [ -d ${SRC_FILE_OR_DIR} ]; then - new_all_utests ${SRC_FILE_OR_DIR} - else - local CLASS_FILE=$(echo ${SRC_FILE_OR_DIR} | sed 's/'$(echo ${BASE_SRC} | sed 's/\//\\\//g')'//g') - if [ ! -z $(cat ${SRC_FILE_OR_DIR} | grep '_endpoint->call($request)->getRs(); } + public function doCallWithRespObj($name, $resp_obj, ...$arguments) + { + if ($resp_obj == null) { + throw new \Exception("doCallWithRespObj param resp_obj is empty"); + } + $request = new \Motan\Request( + $this->_url_obj->getService(), + $name, ...$arguments); + $request->addHeaders($this->_url_obj->getHeaders()); + $request->setGroup($this->_url_obj->getGroup()); + $request->setRespSerializerObj($resp_obj); + $request->setProtocol($this->_url_obj->getProtocol()); + return $this->_endpoint->call($request)->getRs(); + } + public function __call($name, $arguments) { $request_id = $request_args = $request_header = NULL; @@ -148,7 +163,7 @@ public function __call($name, $arguments) /** * multiCall calls a method on multiple backend. - * @param array $url_objs array of backend URL object. + * @param URL[] $url_objs array of backend URL object. * @param string $method RPC method name. * @param mixed ...$args arguments will pass to method. * @return array arary of called result, index 0 is the first response of $url_objs. diff --git a/src/Motan/Cluster/Ha/Failover.php b/src/Motan/Cluster/Ha/Failover.php index b9dd055..18a08af 100644 --- a/src/Motan/Cluster/Ha/Failover.php +++ b/src/Motan/Cluster/Ha/Failover.php @@ -17,6 +17,8 @@ namespace Motan\Cluster\Ha; +use Motan\Cluster\LoadBalance; + /** * HA Failover for PHP 5.6+ * @@ -31,17 +33,22 @@ class Failover extends \Motan\Cluster\HaStrategy { public function call(\Motan\Cluster\LoadBalance $load_balance, \Motan\Request $request) { - $request_id = $args[3]; - $grpc_client = $load_balance->getGrpcClient($request_id); - unset($args[3]); - if (is_callable([$grpc_client, $func_name])) { - $func_call = call_user_func_array([$grpc_client, $func_name], $args); - list($rs, $status) = $func_call->wait(); - if ($status->code === 0) { - return $rs; - } else { - throw new \Exception($status->details . PHP_EOL . print_r($status->metadata, true)); - } - } +// $request_id = $args[3]; +// $grpc_client = $load_balance->getGrpcClient($request_id); +// unset($args[3]); +// if (is_callable([$grpc_client, $func_name])) { +// $func_call = call_user_func_array([$grpc_client, $func_name], $args); +// list($rs, $status) = $func_call->wait(); +// if ($status->code === 0) { +// return $rs; +// } else { +// throw new \Exception($status->details . PHP_EOL . print_r($status->metadata, true)); +// } +// } + } + + public function doUpload(LoadBalance $load_balance, \Motan\Request $request) + { + // TODO: Implement doUpload() method. } } diff --git a/src/Motan/Endpoint/Grpc.php b/src/Motan/Endpoint/Grpc.php index a988ea1..5a73ce2 100644 --- a/src/Motan/Endpoint/Grpc.php +++ b/src/Motan/Endpoint/Grpc.php @@ -56,7 +56,7 @@ private function _getGrpcClient() ]); } - public function call(...$arguments) + public function call(\Motan\Request $request) { // @TODO add GRPC Request Options support $args[0] = $this->_url_obj->getParams()['req_msg']; diff --git a/src/Motan/Endpointer.php b/src/Motan/Endpointer.php index 3a23679..46afe00 100644 --- a/src/Motan/Endpointer.php +++ b/src/Motan/Endpointer.php @@ -179,7 +179,7 @@ public function doUpload(\Motan\Request $request) } @fclose($in); - $res = $this->_doRecv(); + $res = $this->_doRecv($request->getRespSerializerObj()); // @Deprecated start $this->_response = $res->getRawResp(); @@ -264,7 +264,7 @@ public function call(\Motan\Request $request) // $this->_resp_taged = true; // } - $res = $this->_doRecv(); + $res = $this->_doRecv($request->getRespSerializerObj()); // @Deprecated start $this->_response = $res->getRawResp(); @@ -308,7 +308,9 @@ protected function _doSend(\Motan\Request $request) if( !$this->_connection) { throw new \Exception("Connection has gone away!"); } - $req_body = $serializer->serializeMulti(...$request->getRequestArgs()); + if(!is_null($request->getRequestArgs())){ + $req_body = $serializer->serializeMulti(...$request->getRequestArgs()); + } // @TODO check GRPC using \Motan\Request // if (Constants::PROTOCOL_GRPC === $url_obj->getProtocol()) { @@ -358,19 +360,28 @@ protected function _doRecv($resp_obj = NULL) return new \Motan\Response($res, $exception, $resp_msg); } + /** + * multi call + * + * @param Request[] $request_objs + * + * @return array + */ public function multiCall(array $request_objs) { $result = []; $ret_order = []; + $requests = []; $i = 0; foreach ($request_objs as $request) { $seqId = $request->getRequestId(); $this->_doSend($request); $ret_order[$seqId] = $i; + $requests[$seqId] = $request; $i++; } - foreach ($ret_order as $index) { - $ret = $this->_doRecv(); + foreach ($ret_order as $seqId => $index) { + $ret = $this->_doRecv($requests[$seqId]->getRespSerializerObj()); $ret_id = $ret->getResponseHeader()->getRequestId(); // @Deprecated $result[$ret_order[$ret_id]] = $ret->getRs(); @@ -379,6 +390,13 @@ public function multiCall(array $request_objs) return $result; } + /** + * do multi caall + * + * @param Request[] $request_objs + * + * @return MultiResponse + */ public function doMultiCall($request_objs) { $results = $requests = []; @@ -391,7 +409,7 @@ public function doMultiCall($request_objs) continue; } $results[$request_id] = NULL; - $requests[$request_id] = $request_id; + $requests[$request_id] = $request; } $multi_exceptions = []; @@ -400,7 +418,8 @@ public function doMultiCall($request_objs) continue; } try { - $resp= $this->_doRecv(); + $resp_obj = isset($requests[$req_id]) ? $requests[$req_id]->getRespSerializerObj() : null; + $resp= $this->_doRecv($resp_obj); } catch (\Exception $e) { array_push($multi_exceptions, $e); continue; diff --git a/src/Motan/Request.php b/src/Motan/Request.php index fff8344..7623ce1 100644 --- a/src/Motan/Request.php +++ b/src/Motan/Request.php @@ -41,6 +41,7 @@ class Request private $_request_headers = []; private $_serialization; private $_serializer; + private $_resp_serializer_obj = null; public function __construct($service, $method, ...$request_args) { @@ -49,7 +50,7 @@ public function __construct($service, $method, ...$request_args) } $this->_service = $service; $this->_method = $method; - $this->_request_args = $request_args; + $this->_request_args = empty($request_args) ? null : $request_args; $pos = strpos($method, '?'); if ($pos !== FALSE) { $this->_method = \substr($method, 0, $pos); @@ -152,6 +153,26 @@ public function getGroup() return $this->_group; } + /** + * set response object + * + * @param object $obj + * + * @return void + */ + public function setRespSerializerObj($obj) { + $this->_resp_serializer_obj = $obj; + } + + /** + * get response object + * + * @return object + */ + public function getRespSerializerObj() { + return $this->_resp_serializer_obj; + } + /** * setSerialization sets serialization of the request * @param $serialization, value is string typed.such as: simple, breeze diff --git a/src/Motan/Serialize/PB.php b/src/Motan/Serialize/PB.php index c6894b8..45807f4 100644 --- a/src/Motan/Serialize/PB.php +++ b/src/Motan/Serialize/PB.php @@ -19,11 +19,11 @@ /** * Motan PB Serializer for PHP 5.6+ - * + * * 
  * PB 序列化
  *
- * + * * @author idevz * @version V1.0 [created at: 2016-12-23] */ @@ -31,11 +31,30 @@ class PB implements \Motan\Serializer { public function serialize($params) { - return $params->serialize(); + return $params->serializeToString(); + } + + /** + * only support one param + * + * @param mixed ...$params + * + * @return string + */ + public function serializeMulti(...$params) + { + if (!$params) { + return ''; + } + return $params[0]->serializeToString(); } public function deserialize($obj, $data) { - return $obj->deserialize($data); + if ($data && $obj != null) { + $obj->mergeFromString($data); + return $obj; + } + return $data; } } diff --git a/tests/MockServer/BasicService.php b/tests/MockServer/BasicService.php new file mode 100644 index 0000000..07c9e00 --- /dev/null +++ b/tests/MockServer/BasicService.php @@ -0,0 +1,70 @@ +metaData = [ + 'errcode' => $errcode, + 'errmsg' => $errmsg, + 'errtype' => $errtype + ]; + } + public function getMsg() + { + return json_encode($this->metaData); + } +} + +class BasicService +{ + public static $serviceSign = "M_p"; + public static $methodSign = "M_m"; + + public static $exceptionEmptySM = "empty service or method"; + public static $exceptionNotMatchRoute = "provider call panic"; + + public static function exceptionResponse($metaData, $requestId, $serialize, $exceptionMsg): string + { + $metaData["M_e"] = $exceptionMsg; + $respHeader = Motan::buildResponseHeader($requestId, $serialize,MSG_STATUS_EXCEPTION); + $message = new Message($respHeader,$metaData,"",MSG_TYPE_RESPONSE); + return $message->encode(); + } + + public static function TransResponse($metaData, $requestId, $body, $serialize): string + { + $respHeader = Motan::buildResponseHeader($requestId, $serialize, MSG_STATUS_NORMAL); + $respMsg = new Message($respHeader, $metaData, $body, MSG_TYPE_RESPONSE); + return $respMsg->encode(); + } +} \ No newline at end of file diff --git a/tests/MockServer/BreezeService.php b/tests/MockServer/BreezeService.php new file mode 100644 index 0000000..c51016e --- /dev/null +++ b/tests/MockServer/BreezeService.php @@ -0,0 +1,17 @@ +getRequestId(), $body,$header->getSerialize()); + } +} \ No newline at end of file diff --git a/tests/MockServer/GrpcPbService.php b/tests/MockServer/GrpcPbService.php new file mode 100644 index 0000000..66199df --- /dev/null +++ b/tests/MockServer/GrpcPbService.php @@ -0,0 +1,17 @@ +getRequestId(), $body, $header->getSerialize()); + } +} \ No newline at end of file diff --git a/tests/MockServer/Server.php b/tests/MockServer/Server.php new file mode 100644 index 0000000..cfce858 --- /dev/null +++ b/tests/MockServer/Server.php @@ -0,0 +1,102 @@ +socketServer = Socket::getSocketServer($address); + Log::Info("socket address: " . $address); + } + + public function listen() + { + Log::Info("start listen"); + while (true) { + $readSocks = $this->clientSocks; + $readSocks[] = $this->socketServer; + if (!@stream_select($readSocks,$write, $except, 300000)) + { + Log::Info('something went wrong while selecting'); + exit(0); + } + + if (in_array($this->socketServer, $readSocks)) { + $newClient = stream_socket_accept($this->socketServer); + Log::Info("newClient" ); + if ($newClient) { + Log::Info('Connection accepted from ' . stream_socket_get_name($newClient, true)); + $this->clientSocks[] = $newClient; + Log::Info("Now there are total ". count($this->clientSocks) . " clients."); + } + unset($readSocks[array_search($this->socketServer, $readSocks) ]); + } + + foreach($readSocks as $sock) + { + $this->doRequest($sock); + } + } + } + + public function doRequest($sock) + { + Log::Info("do request" ); + try { + $requestMsg = Motan::decode($sock); + } catch (Exception $e) { + unset($this->clientSocks[array_search($sock, $this->clientSocks)]); + @fclose($sock); + Log::Info("Close socket, Now there are total ". count($this->clientSocks) . " clients."); + return; + } + + $metaData = $requestMsg->getMetadata(); + $header = $requestMsg->getHeader(); + $serializer = Utils::getSerializer($header->getSerialize()); + if (empty($serializer)) { + $metaData["M_e"] = "invalid serialize"; + $respHeader = Motan::buildResponseHeader($header->getRequestId(), $header->getSerialize(),MSG_STATUS_EXCEPTION); + $message = new Message($respHeader,$metaData,"",MSG_TYPE_RESPONSE); + @fwrite($sock, $message->encode()); + return; + } + $body = $requestMsg->getBody(); + if ($header->isGzip()) { + $body = zlib_decode($body); + } + $msg = $this->call($metaData, $header, $body, $serializer); + @fwrite($sock, $msg); + } + + public function call(array $metaData,Header $header, $body, Serializer $serializer) + { + Log::Info("do call" ); + if (empty($metaData[BasicService::$serviceSign]) || empty($metaData[BasicService::$methodSign])) { + return BasicService::exceptionResponse($metaData, $header->getRequestId(), $header->getSerialize(), + (new MotanException("provider call panic" , 500, MotanException::ServiceException))->getMsg()); + } + switch ($header->getSerialize()) { + case 1: + return GrpcPbService::call($metaData, $header, $body, $serializer); + case 8: + return BreezeService::call($metaData, $header, $body, $serializer); + case 6: + default: + return SimpleService::call($metaData, $header, $body, $serializer); + } + } +} \ No newline at end of file diff --git a/tests/MockServer/SimpleService.php b/tests/MockServer/SimpleService.php new file mode 100644 index 0000000..8f92e4a --- /dev/null +++ b/tests/MockServer/SimpleService.php @@ -0,0 +1,42 @@ +getRequestId(), $header->getSerialize(), + (new MotanException("method HelloX is not found in provider.",500, MotanException::ServiceException))->getMsg()); + default: + return self::exceptionResponse($metaData, $header->getRequestId(), $header->getSerialize(), + (new MotanException("provider call panic" , 500, MotanException::ServiceException))->getMsg()); + } + } + + public static function hello(array $metaData,Header $header, $body, Serializer $serializer): string + { + $body = $serializer->deserialize(null, $body); + $respBody = $serializer->serialize("hello " . $body); + $respHeader = Motan::buildResponseHeader($header->getRequestId(), $header->getSerialize(), MSG_STATUS_NORMAL); + $respMsg = new Message($respHeader, $metaData, $respBody, MSG_TYPE_RESPONSE); + return $respMsg->encode(); + } +} \ No newline at end of file diff --git a/tests/MockServer/Socket.php b/tests/MockServer/Socket.php new file mode 100644 index 0000000..54ea637 --- /dev/null +++ b/tests/MockServer/Socket.php @@ -0,0 +1,18 @@ +listen(); diff --git a/tests/MockServer/stop-server.php b/tests/MockServer/stop-server.php new file mode 100644 index 0000000..74b7698 --- /dev/null +++ b/tests/MockServer/stop-server.php @@ -0,0 +1,4 @@ +setConnectionTimeOut(50000); $url->setReadTimeOut(50000); $this->object = new Client($url); @@ -27,7 +31,7 @@ protected function setUp() * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + protected function tearDown() : void { } @@ -37,10 +41,7 @@ protected function tearDown() */ public function testGetEndPoint() { - $params = [ - 'hello'=>'motan-php', - 'a'=>'b' - ]; + $params = "testmsg"; $this->object->doCall('Hello', $params); $ep = $this->object->getEndPoint(); $this->assertEquals($ep->getResponseHeader(), $this->object->getResponseHeader()); @@ -52,13 +53,10 @@ public function testGetEndPoint() */ public function testGetResponseHeader() { - $params = [ - 'hello'=>'motan-php', - 'a'=>'b' - ]; + $params = "testmsg"; $this->object->doCall('Hello', $params); $resp_header = $this->object->getResponseHeader(); - $this->assertEquals($resp_header->getMagic(), 0xF1F1); + $this->assertEquals(0xF1F1, $resp_header->getMagic()); } /** @@ -67,18 +65,10 @@ public function testGetResponseHeader() */ public function testGetResponseMetadata() { - $params = [ - 'hello'=>'motan-php', - 'a'=>'b' - ]; + $params = "testmsg"; $this->object->doCall('Hello', $params); $rs = $this->object->getResponseMetadata(); - if (defined('MESH_CALL')) { - $this->assertEquals($rs, []); - } - else { - $this->assertEquals($rs, []); - } + $this->assertNotNull($rs); } /** @@ -89,12 +79,7 @@ public function testGetResponseException() { $this->object->doCall('HelloX', 222, 123, 124, ['string','arr']); $rs = $this->object->getResponseException(); - if (defined('MESH_CALL')) { - $this->assertEquals($rs, '{"errcode":500,"errmsg":"FailOverHA call fail 1 times. Exception: provider call panic","errtype":1}'); - } - else { - $this->assertEquals($rs, '{"errcode":500,"errmsg":"provider call panic","errtype":1}'); - } + $this->assertEquals('{"errcode":500,"errmsg":"method HelloX is not found in provider.","errtype":1}', $rs); } /** @@ -103,13 +88,11 @@ public function testGetResponseException() */ public function testGetResponse() { - $params = [ - 'hello'=>'motan-php', - 'a'=>'b' - ]; + $params = "testmsg"; $this->object->doCall('Hello', $params); $rs = $this->object->getResponse(); - $this->assertObjectHasAttribute('_type', $rs); + $this->assertObjectHasAttribute('_type',$rs); + $this->assertEquals(MSG_TYPE_RESPONSE, $rs->getType()); } /** @@ -118,17 +101,9 @@ public function testGetResponse() */ public function testDoCall() { - $params = [ - 'hello'=>'motan-php', - 'a'=>'b' - ]; + $params = "testmsg"; $rs = $this->object->doCall('Hello', $params); - if (defined('MESH_CALL')) { - $this->assertEquals($rs, '[]-------[128 1 2 128 1 2]'); - } - else { - $this->assertEquals($rs, "[]-------[128 1 2 128 1 2]"); - } + $this->assertEquals("hello testmsg", $rs); } /** @@ -137,12 +112,9 @@ public function testDoCall() */ public function test__call() { - $params = [ - 'hello'=>'motan-php', - 'a'=>'b' - ]; + $params = "testmsg"; $rs = $this->object->Hello($params); - $this->assertEquals($rs, "[]-------[128 1 2 128 1 2]"); + $this->assertEquals("hello testmsg", $rs); } /** @@ -151,14 +123,11 @@ public function test__call() */ public function testMultiCall() { - $url_str1 = 'motan2://127.0.0.1:9981/com.weibo.HelloMTService?group=motan-demo-rpc&method=Hello&a=a&b=b'; - $url_str2 = 'motan2://127.0.0.1:9981/com.weibo.HelloMTService?group=motan-demo-rpc&method=HelloW&a=a&b=b'; - $url1 = new \Motan\URL($url_str1); - $url2 = new \Motan\URL($url_str2); - $rs = $this->object->multiCall([$url1, $url2]); - $this->assertEquals($rs[0], '[]-------[128 1 2 128 1 2]'); - - $rs_empty = $this->object->multiCall([]); - $this->assertEquals($rs_empty, []); + $url_str1 = 'motan2://127.0.0.1:9981/com.weibo.HelloMTService?group=motan-demo-rpc&method=Hello'; + $url_str2 = 'motan2://127.0.0.1:9981/com.weibo.HelloMTService?group=motan-demo-rpc&method=HelloX'; + $url1 = new URL($url_str1); + $url2 = new URL($url_str2); + $rs = $this->object->multiCall([$url1, $url2], 'Hello', "testmsg"); + $this->assertEquals("hello testmsg", $rs[0]); } } diff --git a/tests/Motan/Cluster/Ha/FailfastTest.php b/tests/Motan/Cluster/Ha/FailfastTest.php index 903b451..cab095e 100644 --- a/tests/Motan/Cluster/Ha/FailfastTest.php +++ b/tests/Motan/Cluster/Ha/FailfastTest.php @@ -15,17 +15,16 @@ class FailfastTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Failfast; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/Cluster/Ha/FailoverTest.php b/tests/Motan/Cluster/Ha/FailoverTest.php index 5847f70..ee071e3 100644 --- a/tests/Motan/Cluster/Ha/FailoverTest.php +++ b/tests/Motan/Cluster/Ha/FailoverTest.php @@ -15,17 +15,16 @@ class FailoverTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Failover; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/Cluster/HaStrategyTest.php b/tests/Motan/Cluster/HaStrategyTest.php index 04d9253..373a603 100644 --- a/tests/Motan/Cluster/HaStrategyTest.php +++ b/tests/Motan/Cluster/HaStrategyTest.php @@ -15,17 +15,16 @@ class HaStrategyTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new HaStrategy; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/Cluster/LoadBalance/RandomTest.php b/tests/Motan/Cluster/LoadBalance/RandomTest.php index 0f4b8ae..e470729 100644 --- a/tests/Motan/Cluster/LoadBalance/RandomTest.php +++ b/tests/Motan/Cluster/LoadBalance/RandomTest.php @@ -15,17 +15,16 @@ class RandomTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Random; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/Cluster/LoadBalance/RoundRobinTest.php b/tests/Motan/Cluster/LoadBalance/RoundRobinTest.php index 84a5f05..b4afef0 100644 --- a/tests/Motan/Cluster/LoadBalance/RoundRobinTest.php +++ b/tests/Motan/Cluster/LoadBalance/RoundRobinTest.php @@ -15,17 +15,16 @@ class RoundRobinTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new RoundRobin; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } @@ -59,7 +58,7 @@ public function testSelect() */ public function testSelectToHolder() { - // Remove the following lines when you implement this test. + // Remove the following lines when you implement this test. $this->markTestIncomplete( 'This test has not been implemented yet.' ); diff --git a/tests/Motan/Cluster/LoadBalanceTest.php b/tests/Motan/Cluster/LoadBalanceTest.php index 8c0f37d..e951148 100644 --- a/tests/Motan/Cluster/LoadBalanceTest.php +++ b/tests/Motan/Cluster/LoadBalanceTest.php @@ -15,17 +15,16 @@ class LoadBalanceTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new LoadBalance; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/ClusterTest.php b/tests/Motan/ClusterTest.php index d5ca152..1f0ae4c 100644 --- a/tests/Motan/ClusterTest.php +++ b/tests/Motan/ClusterTest.php @@ -15,17 +15,16 @@ class ClusterTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Cluster; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/ConstantsTest.php b/tests/Motan/ConstantsTest.php index 75761b5..7f97b43 100644 --- a/tests/Motan/ConstantsTest.php +++ b/tests/Motan/ConstantsTest.php @@ -15,7 +15,7 @@ class ConstantsTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->object = new Constants; } @@ -24,12 +24,12 @@ protected function setUp() * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } public function testConstants() { - $this->assertEquals(\Motan\Constants::DEFAULT_AGENT_PORT, 9981); + $this->assertEquals(Constants::DEFAULT_AGENT_PORT, 9981); } } diff --git a/tests/Motan/Endpoint/AgentTest.php b/tests/Motan/Endpoint/AgentTest.php index 03234c9..be990e6 100644 --- a/tests/Motan/Endpoint/AgentTest.php +++ b/tests/Motan/Endpoint/AgentTest.php @@ -15,17 +15,16 @@ class AgentTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Agent; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/Endpoint/GrpcTest.php b/tests/Motan/Endpoint/GrpcTest.php index 9b818eb..2562e4d 100644 --- a/tests/Motan/Endpoint/GrpcTest.php +++ b/tests/Motan/Endpoint/GrpcTest.php @@ -15,17 +15,16 @@ class GrpcTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Grpc; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/Endpoint/MotanTest.php b/tests/Motan/Endpoint/MotanTest.php index 8f23be2..b8b92ed 100644 --- a/tests/Motan/Endpoint/MotanTest.php +++ b/tests/Motan/Endpoint/MotanTest.php @@ -15,17 +15,16 @@ class MotanTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Motan; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/EndpointerTest.php b/tests/Motan/EndpointerTest.php index 5ca8418..f30e804 100644 --- a/tests/Motan/EndpointerTest.php +++ b/tests/Motan/EndpointerTest.php @@ -15,17 +15,16 @@ class EndpointerTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Endpointer; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/MClientTest.php b/tests/Motan/MClientTest.php index 934d10a..3b23468 100644 --- a/tests/Motan/MClientTest.php +++ b/tests/Motan/MClientTest.php @@ -18,80 +18,80 @@ class MClientTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { - $app_name = 'phpt-test-MClient'; - $this->object = new MClient( $app_name ); + $this->object = new MClient(); } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } + /** + * @covers Motan\MClient::doCall + * @todo Implement testDoCall(). + */ + public function testDoCall() + { + $req1 = new Request(DEFAULT_SERVICE, 'Hello', "testmsg"); + $res = $this->object->doCall($req1, "testmsg"); + $this->assertEquals("hello testmsg", $res); + } + /** * @covers Motan\MClient::doMultiCall * @todo Implement testDoMultiCall(). */ public function testDoMultiCall() { - $req1 = new \Motan\Request(DEFAULT_SERVICE, 'Hello', ['a' => 'b']); - $req2 = new \Motan\Request(DEFAULT_SERVICE, 'Hello', ['xx' => 'wwww']); - $req3 = new \Motan\Request(DEFAULT_SERVICE, 'HelloX', 'string', 123,124,['string','arr']); + $req1 = new Request(DEFAULT_SERVICE, 'Hello', "testmsg"); + $req2 = new Request(DEFAULT_SERVICE, 'HelloX', 'string', 123,124,['string','arr']); $req1->setGroup(DEFAULT_GROUP); $req2->setGroup(DEFAULT_GROUP); - $req3->setGroup(DEFAULT_GROUP); $multi_resp = $this->object->doMultiCall([ - $req1, $req2, $req3 + $req1, $req2 ]); - $this->assertEquals($multi_resp->getRs($req1), "[]-------[128 1 2 128 1 2]"); + $this->assertEquals("hello testmsg", $multi_resp->getRs($req1)); $rs_empty = $this->object->doMultiCall([]); - $this->assertEquals($rs_empty, []); + $this->assertEquals([], $rs_empty); } /** - * @covers Motan\MClient::getMRs + * @covers Motan\MClient::doMultiCall * @todo Implement testGetMRs(). */ public function testGetMRs() { - $req1 = new \Motan\Request(DEFAULT_SERVICE, 'Hello', ['a' => 'b']); - $req2 = new \Motan\Request(DEFAULT_SERVICE, 'Hello', ['xx' => 'wwww']); - $req3 = new \Motan\Request(DEFAULT_SERVICE, 'HelloX', 'string', 123,124,['string','arr']); + $req1 = new Request(DEFAULT_SERVICE, 'Hello', "testmsg"); + $req2 = new Request(DEFAULT_SERVICE, 'HelloX', 'string', 123,124,['string','arr']); $req1->setGroup(DEFAULT_GROUP); $req2->setGroup(DEFAULT_GROUP); - $req3->setGroup(DEFAULT_GROUP); - $multi_resp = $this->object->doMultiCall([ - $req1, $req2, $req3 + $multi_resp = $this->object->doMultiCall([ + $req1, $req2 ]); $rs = $multi_resp->getRs($req1); - $this->assertEquals($rs, "[]-------[128 1 2 128 1 2]"); + $this->assertEquals("hello testmsg", $rs); } /** - * @covers Motan\MClient::getMException + * @covers Motan\MClient::doMultiCall * @todo Implement testGetMException(). */ public function testGetMException() { - $req1 = new \Motan\Request(DEFAULT_SERVICE, 'Hello', ['a' => 'b']); - $req2 = new \Motan\Request(DEFAULT_SERVICE, 'Hello', ['xx' => 'wwww']); - $req3 = new \Motan\Request(DEFAULT_SERVICE, 'HelloX', 33, 123,124,['string','arr']); + $req1 = new Request(DEFAULT_SERVICE, 'Hello', "testmsg"); + $req2 = new Request(DEFAULT_SERVICE, 'HelloX', 'string', 123,124,['string','arr']); $req1->setGroup(DEFAULT_GROUP); $req2->setGroup(DEFAULT_GROUP); - $req3->setGroup(DEFAULT_GROUP); - $multi_resp = $this->object->doMultiCall([ - $req1, $req2, $req3 + $multi_resp = $this->object->doMultiCall([ + $req1, $req2 ]); - $rs = $multi_resp->getException($req3); - if (defined('MESH_CALL')) { - $this->assertEquals($rs, '{"errcode":500,"errmsg":"FailOverHA call fail 1 times. Exception: provider call panic","errtype":1}'); - }else { - $this->assertEquals($rs, '{"errcode":500,"errmsg":"provider call panic","errtype":1}'); - } + $rs = $multi_resp->getException($req2); + $this->assertEquals('{"errcode":500,"errmsg":"method HelloX is not found in provider.","errtype":1}', $rs); } } diff --git a/tests/Motan/Protocol/HeaderTest.php b/tests/Motan/Protocol/HeaderTest.php index d414895..6734911 100644 --- a/tests/Motan/Protocol/HeaderTest.php +++ b/tests/Motan/Protocol/HeaderTest.php @@ -15,17 +15,16 @@ class HeaderTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Header; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } @@ -95,7 +94,7 @@ public function testIsHeartbeat() */ public function testSetGzip() { - // Remove the following lines when you implement this test. + // Remove the following lines when you implement this test. $this->markTestIncomplete( 'This test has not been implemented yet.' ); @@ -107,7 +106,7 @@ public function testSetGzip() */ public function testIsGzip() { - // Remove the following lines when you implement this test. + // Remove the following lines when you implement this test. $this->markTestIncomplete( 'This test has not been implemented yet.' ); @@ -131,7 +130,7 @@ public function testSetOneWay() */ public function testIsOneWay() { - // Remove the following lines when you implement this test. + // Remove the following lines when you implement this test. $this->markTestIncomplete( 'This test has not been implemented yet.' ); diff --git a/tests/Motan/Protocol/MessageTest.php b/tests/Motan/Protocol/MessageTest.php index d6228c1..18b9fc9 100644 --- a/tests/Motan/Protocol/MessageTest.php +++ b/tests/Motan/Protocol/MessageTest.php @@ -15,17 +15,16 @@ class MessageTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Message; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/Protocol/MotanTest.php b/tests/Motan/Protocol/MotanTest.php index 4a28ecc..b484c65 100644 --- a/tests/Motan/Protocol/MotanTest.php +++ b/tests/Motan/Protocol/MotanTest.php @@ -15,7 +15,7 @@ class MotanTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); $this->object = new Motan; @@ -25,7 +25,7 @@ protected function setUp() * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/RequestTest.php b/tests/Motan/RequestTest.php index 270cdf1..17c324f 100644 --- a/tests/Motan/RequestTest.php +++ b/tests/Motan/RequestTest.php @@ -15,17 +15,16 @@ class RequestTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Request; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/ResponseTest.php b/tests/Motan/ResponseTest.php index 38c8ded..45f0fa6 100644 --- a/tests/Motan/ResponseTest.php +++ b/tests/Motan/ResponseTest.php @@ -15,17 +15,16 @@ class ResponseTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Response; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/Resty/ClientTest.php b/tests/Motan/Resty/ClientTest.php index 550b0b3..94c6174 100644 --- a/tests/Motan/Resty/ClientTest.php +++ b/tests/Motan/Resty/ClientTest.php @@ -15,18 +15,18 @@ class ClientTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $this->object = new Client; } /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { + parent::tearDown(); } /** diff --git a/tests/Motan/Resty/ConfsTest.php b/tests/Motan/Resty/ConfsTest.php index 0f313ec..62e9bff 100644 --- a/tests/Motan/Resty/ConfsTest.php +++ b/tests/Motan/Resty/ConfsTest.php @@ -15,7 +15,7 @@ class ConfsTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); $url = "motan2://127.0.0.1:9981/com.weibo.HelloMTService?group=motan-demo-rpc"; @@ -26,8 +26,9 @@ protected function setUp() * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { + parent::tearDown(); } /** diff --git a/tests/Motan/Serialize/GrpcJsonTest.php b/tests/Motan/Serialize/GrpcJsonTest.php index 6f06782..0ff0423 100644 --- a/tests/Motan/Serialize/GrpcJsonTest.php +++ b/tests/Motan/Serialize/GrpcJsonTest.php @@ -15,8 +15,9 @@ class GrpcJsonTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { + $this->markTestSkipped('Just Skip this.'); $this->object = new GrpcJson; } @@ -24,7 +25,7 @@ protected function setUp() * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/Serialize/MotanTest.php b/tests/Motan/Serialize/MotanTest.php index ebab1d6..817c49a 100644 --- a/tests/Motan/Serialize/MotanTest.php +++ b/tests/Motan/Serialize/MotanTest.php @@ -15,8 +15,9 @@ class MotanTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { + $this->markTestSkipped('Just Skip this.'); $this->object = new Motan; } @@ -24,7 +25,7 @@ protected function setUp() * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/Serialize/PBTest.php b/tests/Motan/Serialize/PBTest.php index 00a26c0..402f117 100644 --- a/tests/Motan/Serialize/PBTest.php +++ b/tests/Motan/Serialize/PBTest.php @@ -15,8 +15,9 @@ class PBTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { + $this->markTestSkipped('Just Skip this.'); $this->object = new PB; } @@ -24,7 +25,7 @@ protected function setUp() * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } @@ -51,4 +52,12 @@ public function testDeserialize() 'This test has not been implemented yet.' ); } + + public function testSerializeMulti() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } } diff --git a/tests/Motan/Transport/ConnectionTest.php b/tests/Motan/Transport/ConnectionTest.php index d5872b2..bfb6b3a 100644 --- a/tests/Motan/Transport/ConnectionTest.php +++ b/tests/Motan/Transport/ConnectionTest.php @@ -15,10 +15,10 @@ class ConnectionTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); - $url_obj = new \Motan\Url("motan2://127.0.0.1:9981/com.weibo.HelloMTService?group=motan-demo-rpc"); + $url_obj = new \Motan\Url("motan2://127.0.0.1:9981/com.weibo.HelloMTService?group=motan-demo-rpc"); $this->object = new Connection($url_obj); } @@ -26,7 +26,7 @@ protected function setUp() * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/URLTest.php b/tests/Motan/URLTest.php index d8b9420..1c2d008 100644 --- a/tests/Motan/URLTest.php +++ b/tests/Motan/URLTest.php @@ -15,7 +15,7 @@ class URLTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); $this->object = new URL("motan2://127.0.0.1:9981/com.weibo.HelloMTService?group=motan-demo-rpc"); @@ -25,7 +25,7 @@ protected function setUp() * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/Motan/UtilsTest.php b/tests/Motan/UtilsTest.php index ca33e48..1943b35 100644 --- a/tests/Motan/UtilsTest.php +++ b/tests/Motan/UtilsTest.php @@ -15,7 +15,7 @@ class UtilsTest extends \PHPUnit\Framework\TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() : void { $this->markTestSkipped('Just Skip this.'); $this->object = new Utils; @@ -25,7 +25,7 @@ protected function setUp() * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. */ - protected function tearDown() + public function tearDown() : void { } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 0c9aad1..a8129ca 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,14 +1,51 @@ 0) { + $count = 0; + while (!$connection) { + $connection = @stream_socket_client("tcp://127.0.0.1:9981"); + echo "sleep 1 second wait server start\n"; + sleep(1); + $count++; + if ($count > 10) { + exit(0); + } + } + @fclose($connection); +} elseif ($pid == 0){ + if ($connection) { + return; + } + $spid = pcntl_fork(); + if ($spid > 0) { + sleep(60); + posix_kill($spid , SIGINT); + sleep(1); + exit(0); + } elseif($spid == 0) { + include_once __DIR__."/MockServer/BasicService.php"; + include_once __DIR__."/MockServer/Server.php"; + include_once __DIR__."/MockServer/Socket.php"; + include_once __DIR__ . "/MockServer/GrpcPbService.php"; + include_once __DIR__."/MockServer/BreezeService.php"; + include_once __DIR__."/MockServer/SimpleService.php"; -// @TODO testing for mesh panic, and using mesh snapshot -// this need run mesh in the same node with php client -define('AGENT_RUN_PATH', $_SERVER["PWD"] . '/weibo-mesh-runpath'); - -define('DEFAULT_TEST_URL', 'motan2://127.0.0.1:9981/com.weibo.HelloMTService?group=motan-demo-rpc'); + $server = new Server(); + pcntl_signal(SIGINT, function () { + exit(0); + }); + $server->listen(); + } +} \ No newline at end of file