com php-src: Fixed and improved tests: Zend/tests/memory_get _peak_usage.phpt ext/pdo_mysql/tests/PDO_getAvaliab leDrivers.phpt
ext/sockets/tests/socket_clear_error.p hpt ext/sockets/tests/socket_getopt.phpt ext/standard/t ests/general_functions/connection_aborted.phpt ext/stan
dard/tests/general_functions/connection_status.phpt ext /standard/tests/streams/stream_get_wrappers.phpt ext/st
andard/tests/streams/stream_socket_enable_crypto.phpt socket_clear

From: Date: Thu, 24 Dec 2015 13:08:44 +0000
Subject: com php-src: Fixed and improved tests: Zend/tests/memory_get _peak_usage.phpt ext/pdo_mysql/tests/PDO_getAvaliab leDrivers.phpt
ext/sockets/tests/socket_clear_error.p hpt ext/sockets/tests/socket_getopt.phpt ext/standard/t ests/general_functions/connection_aborted.phpt ext/stan
dard/tests/general_functions/connection_status.phpt ext /standard/tests/streams/stream_get_wrappers.phpt ext/st
andard/tests/streams/stream_socket_enable_crypto.phpt socket_clear
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90443@lists.php.net to get a copy of this message
Commit: d73d9fecf6c7a4cf2a7443f1a3833c8fb6e30ea1 Author: Julien Pauli <jpauli@php.net> Thu, 24 Dec 2015 13:33:22 +0100 Parents: 7f31a88bb8493eaa4968db6169b939342f0ba0f7 Branches: PHP-5.6 PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d73d9fecf6c7a4cf2a7443f1a3833c8fb6e30ea1 Log: Fixed and improved tests Changed paths: M Zend/tests/memory_get_peak_usage.phpt M ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt A ext/sockets/tests/socket_clear_error.phpt M ext/sockets/tests/socket_getopt.phpt M ext/standard/tests/general_functions/connection_aborted.phpt M ext/standard/tests/general_functions/connection_status.phpt M ext/standard/tests/streams/stream_get_wrappers.phpt M ext/standard/tests/streams/stream_socket_enable_crypto.phpt D socket_clear_error.phpt Diff: diff --git a/Zend/tests/memory_get_peak_usage.phpt b/Zend/tests/memory_get_peak_usage.phpt index cc1cf6b..ba6f4fd 100644 --- a/Zend/tests/memory_get_peak_usage.phpt +++ b/Zend/tests/memory_get_peak_usage.phpt @@ -4,11 +4,14 @@ int memory_get_peak_usage ([ bool $real_usage = false ] ); marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br --FILE-- <?php -var_dump(memory_get_peak_usage()); +var_dump($a = memory_get_peak_usage()); var_dump(memory_get_peak_usage(true)); var_dump(memory_get_peak_usage(false)); +$array = range(1,1024*1024); +var_dump(memory_get_peak_usage() > $a); ?> --EXPECTF-- int(%d) int(%d) int(%d) +bool(true) diff --git a/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt b/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt index e90ab5f..07ddca1 100644 --- a/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt +++ b/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt @@ -5,7 +5,7 @@ array pdo_drivers ( void ); marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br --FILE-- <?php -print((is_array(PDO::getAvailableDrivers())) ? ("yes") : ("Test 'array stream_get_wrappers ( void );' has failed")); +print((is_array(PDO::getAvailableDrivers())) ? ("yes") : ("Test failed")); ?> --EXPECT-- yes diff --git a/ext/sockets/tests/socket_clear_error.phpt b/ext/sockets/tests/socket_clear_error.phpt new file mode 100644 index 0000000..af9acaa --- /dev/null +++ b/ext/sockets/tests/socket_clear_error.phpt @@ -0,0 +1,28 @@ +--TEST-- +void socket_clear_error ([ resource $socket ] ) ; +--CREDITS-- +marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br +--SKIPIF-- +<?php +if (!extension_loaded('sockets')) { + die('SKIP sockets extension not available.'); +} +?> +--FILE-- +<?php +$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); +$socketConn = socket_connect($socket, "127.0.0.1", 21248); +var_dump(socket_last_error($socket)); +socket_clear_error($socket); +var_dump(socket_last_error($socket)); +?> +--CLEAN-- +<?php +socket_close($socket); +unset($socket); +unset($socketConn); +?> +--EXPECTF-- +Warning: socket_connect(): unable to connect [%d]: Connection refused in %s on line %d +int(%d) +int(%d) diff --git a/ext/sockets/tests/socket_getopt.phpt b/ext/sockets/tests/socket_getopt.phpt index 639328c..12c0aeb 100644 --- a/ext/sockets/tests/socket_getopt.phpt +++ b/ext/sockets/tests/socket_getopt.phpt @@ -3,12 +3,11 @@ mixed socket_getopt( resource $socket , int $level , int $optname ) ; --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br --SKIPIF-- +<?php if (!extension_loaded('sockets')) { die('skip sockets extension not available.'); } -if (socket_set_option($s, $level, IP_MULTICAST_IF, 1) === false) { - die("skip interface 1 either doesn't exist or has no ipv4 address"); -} +?> --FILE-- <?php $domain = AF_INET; diff --git a/ext/standard/tests/general_functions/connection_aborted.phpt b/ext/standard/tests/general_functions/connection_aborted.phpt index edb7828..79618c2 100644 --- a/ext/standard/tests/general_functions/connection_aborted.phpt +++ b/ext/standard/tests/general_functions/connection_aborted.phpt @@ -7,4 +7,4 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p var_dump(connection_aborted()); ?> --EXPECTF-- -int(%i) +int(0) diff --git a/ext/standard/tests/general_functions/connection_status.phpt b/ext/standard/tests/general_functions/connection_status.phpt index fe0f28f..5e0677f 100644 --- a/ext/standard/tests/general_functions/connection_status.phpt +++ b/ext/standard/tests/general_functions/connection_status.phpt @@ -4,7 +4,7 @@ int connection_status ( void ); marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br --FILE-- <?php -var_dump(connection_status()); +var_dump(connection_status() == CONNECTION_NORMAL); ?> --EXPECTF-- -int(%i) +bool(true) diff --git a/ext/standard/tests/streams/stream_get_wrappers.phpt b/ext/standard/tests/streams/stream_get_wrappers.phpt index e02b539..58dfdc9 100644 --- a/ext/standard/tests/streams/stream_get_wrappers.phpt +++ b/ext/standard/tests/streams/stream_get_wrappers.phpt @@ -11,6 +11,11 @@ if (phpversion() < "5.3.0") { --FILE-- <?php print((is_array(stream_get_wrappers())) ? ("yes") : ("Test 'array stream_get_wrappers ( void );' has failed")); +echo "\n"; +class Foo { } +stream_wrapper_register("foo", "Foo"); +var_dump(in_array("foo", stream_get_wrappers())); ?> --EXPECT-- yes +bool(true) diff --git a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt index fa5ab54..47d6c62 100644 --- a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt +++ b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt @@ -5,6 +5,7 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p --SKIPIF-- <?php if (phpversion() < "5.3.0") { die('SKIP php version so lower.'); } +if (!extension_loaded('openssl')) { die('ext/openssl required'); } ?> --FILE-- <?php @@ -39,7 +40,7 @@ bool(false) Warning: stream_socket_enable_crypto(): When enabling encryption you must specify the crypto type in %s on line %d bool(false) -Warning: stream_socket_enable_crypto(): SSLv2 unavailable in the OpenSSL library against which PHP is linked in %s on line %d +Warning: stream_socket_enable_crypto(): SSLv2 %s in %s on line %d bool(false) Warning: stream_socket_enable_crypto(): SSL: Broken pipe in %s on line %d diff --git a/socket_clear_error.phpt b/socket_clear_error.phpt deleted file mode 100644 index c5b64c9..0000000 --- a/socket_clear_error.phpt +++ /dev/null @@ -1,34 +0,0 @@ ---TEST-- -void socket_clear_error ([ resource $socket ] ) ; ---CREDITS-- -marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br ---SKIPIF-- -<?php -if (!extension_loaded('sockets')) { - die('SKIP sockets extension not available.'); -} -if (!defined("SO_BINDTODEVICE")) { - die('SKIP SO_BINDTODEVICE not supported on this platform.'); -} -if (!function_exists("posix_getuid") || posix_getuid() != 0) { - die('SKIP SO_BINDTODEVICE requires root permissions.'); -} -?> ---FILE-- -<?php -$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); -$socketConn = socket_connect($socket, "127.0.0.1", 21); -var_dump(socket_last_error($socket)); -socket_clear_error($socket); -var_dump(socket_last_error($socket)); -?> ---CLEAN-- -<?php -socket_close($socket); -unset($socket); -unset($socketConn); -?> ---EXPECTF-- -Warning: socket_connect(): unable to connect [%d]: Connection refused in %s on line %d -int(%d) -int(%d)

« previous php.cvs (#90443) next »