rasmus Sun, 09 Aug 2009 14:50:51 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286953
Log:
Make these socket tests less Linux-specific
Changed paths:
U php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_create_listen.phpt
U
php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_create_pair-wrongparams.phpt
U
php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
U
php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
U
php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_set_block-retval.phpt
U
php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_set_nonblock-retval.phpt
U php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_create_listen.phpt
U
php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_create_pair-wrongparams.phpt
U
php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
U
php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
U
php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_set_block-retval.phpt
U
php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_set_nonblock-retval.phpt
U php/php-src/trunk/ext/sockets/tests/socket_create_listen.phpt
U php/php-src/trunk/ext/sockets/tests/socket_create_pair-wrongparams.phpt
U php/php-src/trunk/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
U php/php-src/trunk/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
U php/php-src/trunk/ext/sockets/tests/socket_set_block-retval.phpt
U php/php-src/trunk/ext/sockets/tests/socket_set_nonblock-retval.phpt
Modified: php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_create_listen.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_create_listen.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_create_listen.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -1,5 +1,5 @@
--TEST--
-Test if socket binds on 31337
+Test if socket binds on 31338
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
@@ -7,12 +7,12 @@
}
--FILE--
<?php
-$sock = socket_create_listen(31337);
+$sock = socket_create_listen(31338);
socket_getsockname($sock, $addr, $port);
var_dump($addr, $port);
--EXPECT--
string(7) "0.0.0.0"
-int(31337)
+int(31338)
--CREDITS--
Till Klampaeckel, t...@php.net
PHP Testfest Berlin 2009-05-09
Modified: php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_create_pair-wrongparams.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_create_pair-wrongparams.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_create_pair-wrongparams.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -24,17 +24,17 @@
Warning: socket_create_pair() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
NULL
-Warning: socket_create_pair(): unable to create socket pair [94]: Socket type not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
bool(false)
Warning: socket_create_pair(): invalid socket domain [31337] specified for argument 1, assuming AF_INET in %s on line %d
-Warning: socket_create_pair(): unable to create socket pair [94]: Socket type not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
bool(false)
Warning: socket_create_pair(): invalid socket type [31337] specified for argument 2, assuming SOCK_STREAM in %s on line %d
-Warning: socket_create_pair(): unable to create socket pair [95]: Operation not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported %s on line %d
bool(false)
--CREDITS--
Till Klampaeckel, t...@php.net
Modified: php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -44,7 +44,7 @@
socket_close($socket);
--EXPECTF--
-Warning: socket_recvfrom(): unable to recvfrom [11]: Resource temporarily unavailable in %s on line %d
+Warning: socket_recvfrom(): unable to recvfrom [%d]: Resource temporarily unavailable in %s on line %d
Warning: Wrong parameter count for socket_sendto() in %s on line %d
Modified: php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -49,9 +49,9 @@
@unlink($address);
?>
--EXPECTF--
-Warning: socket_create(): Unable to create socket [93]: Protocol not supported in %s on line %d
+Warning: socket_create(): Unable to create socket [%d]: Protocol not supported in %s on line %d
-Warning: socket_recvfrom(): unable to recvfrom [11]: Resource temporarily unavailable in %s on line %d
+Warning: socket_recvfrom(): unable to recvfrom [%d]: Resource temporarily unavailable in %s on line %d
Warning: socket_sendto() expects at least 5 parameters, 4 given in %s on line %d
bool(false)
Modified: php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_set_block-retval.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_set_block-retval.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_set_block-retval.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -9,11 +9,11 @@
--FILE--
<?php
-$socket = socket_create_listen(31337);
+$socket = socket_create_listen(31339);
var_dump(socket_set_block($socket));
socket_close($socket);
-$socket2 = socket_create_listen(31338);
+$socket2 = socket_create_listen(31340);
socket_close($socket2);
var_dump(socket_set_block($socket2));
Modified: php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_set_nonblock-retval.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_set_nonblock-retval.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_2/ext/sockets/tests/socket_set_nonblock-retval.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -9,11 +9,11 @@
--FILE--
<?php
-$socket = socket_create_listen(31337);
+$socket = socket_create_listen(31339);
var_dump(socket_set_nonblock($socket));
socket_close($socket);
-$socket2 = socket_create_listen(31338);
+$socket2 = socket_create_listen(31340);
socket_close($socket2);
var_dump(socket_set_nonblock($socket2));
Modified: php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_create_listen.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_create_listen.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_create_listen.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -1,5 +1,5 @@
--TEST--
-Test if socket binds on 31337
+Test if socket binds on 31338
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
@@ -7,12 +7,12 @@
}
--FILE--
<?php
-$sock = socket_create_listen(31337);
+$sock = socket_create_listen(31338);
socket_getsockname($sock, $addr, $port);
var_dump($addr, $port);
--EXPECT--
string(7) "0.0.0.0"
-int(31337)
+int(31338)
--CREDITS--
Till Klampaeckel, t...@php.net
PHP Testfest Berlin 2009-05-09
Modified: php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_create_pair-wrongparams.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_create_pair-wrongparams.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_create_pair-wrongparams.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -24,17 +24,17 @@
Warning: socket_create_pair() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
NULL
-Warning: socket_create_pair(): unable to create socket pair [94]: Socket type not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
bool(false)
Warning: socket_create_pair(): invalid socket domain [31337] specified for argument 1, assuming AF_INET in %s on line %d
-Warning: socket_create_pair(): unable to create socket pair [94]: Socket type not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
bool(false)
Warning: socket_create_pair(): invalid socket type [31337] specified for argument 2, assuming SOCK_STREAM in %s on line %d
-Warning: socket_create_pair(): unable to create socket pair [95]: Operation not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported %s on line %d
bool(false)
--CREDITS--
Till Klampaeckel, t...@php.net
Modified: php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -44,7 +44,7 @@
socket_close($socket);
--EXPECTF--
-Warning: socket_recvfrom(): unable to recvfrom [11]: Resource temporarily unavailable in %s on line %d
+Warning: socket_recvfrom(): unable to recvfrom [%d]: Resource temporarily unavailable in %s on line %d
Warning: Wrong parameter count for socket_sendto() in %s on line %d
Modified: php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -49,9 +49,9 @@
@unlink($address);
?>
--EXPECTF--
-Warning: socket_create(): Unable to create socket [93]: Protocol not supported in %s on line %d
+Warning: socket_create(): Unable to create socket [%d]: Protocol not supported in %s on line %d
-Warning: socket_recvfrom(): unable to recvfrom [11]: Resource temporarily unavailable in %s on line %d
+Warning: socket_recvfrom(): unable to recvfrom [%d]: Resource temporarily unavailable in %s on line %d
Warning: socket_sendto() expects at least 5 parameters, 4 given in %s on line %d
bool(false)
Modified: php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_set_block-retval.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_set_block-retval.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_set_block-retval.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -9,11 +9,11 @@
--FILE--
<?php
-$socket = socket_create_listen(31337);
+$socket = socket_create_listen(31339);
var_dump(socket_set_block($socket));
socket_close($socket);
-$socket2 = socket_create_listen(31338);
+$socket2 = socket_create_listen(31340);
socket_close($socket2);
var_dump(socket_set_block($socket2));
Modified: php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_set_nonblock-retval.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_set_nonblock-retval.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_set_nonblock-retval.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -9,11 +9,11 @@
--FILE--
<?php
-$socket = socket_create_listen(31337);
+$socket = socket_create_listen(31339);
var_dump(socket_set_nonblock($socket));
socket_close($socket);
-$socket2 = socket_create_listen(31338);
+$socket2 = socket_create_listen(31340);
socket_close($socket2);
var_dump(socket_set_nonblock($socket2));
Modified: php/php-src/trunk/ext/sockets/tests/socket_create_listen.phpt
===================================================================
--- php/php-src/trunk/ext/sockets/tests/socket_create_listen.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/trunk/ext/sockets/tests/socket_create_listen.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -1,5 +1,5 @@
--TEST--
-Test if socket binds on 31337
+Test if socket binds on 31338
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
@@ -7,12 +7,12 @@
}
--FILE--
<?php
-$sock = socket_create_listen(31337);
+$sock = socket_create_listen(31338);
socket_getsockname($sock, $addr, $port);
var_dump($addr, $port);
--EXPECT--
string(7) "0.0.0.0"
-int(31337)
+int(31338)
--CREDITS--
Till Klampaeckel, t...@php.net
PHP Testfest Berlin 2009-05-09
Modified: php/php-src/trunk/ext/sockets/tests/socket_create_pair-wrongparams.phpt
===================================================================
--- php/php-src/trunk/ext/sockets/tests/socket_create_pair-wrongparams.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/trunk/ext/sockets/tests/socket_create_pair-wrongparams.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -24,17 +24,17 @@
Warning: socket_create_pair() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
NULL
-Warning: socket_create_pair(): unable to create socket pair [94]: Socket type not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
bool(false)
Warning: socket_create_pair(): invalid socket domain [31337] specified for argument 1, assuming AF_INET in %s on line %d
-Warning: socket_create_pair(): unable to create socket pair [94]: Socket type not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d
bool(false)
Warning: socket_create_pair(): invalid socket type [31337] specified for argument 2, assuming SOCK_STREAM in %s on line %d
-Warning: socket_create_pair(): unable to create socket pair [95]: Operation not supported in %s on line %d
+Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported %s on line %d
bool(false)
--CREDITS--
Till Klampaeckel, t...@php.net
Modified: php/php-src/trunk/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
===================================================================
--- php/php-src/trunk/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/trunk/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -44,7 +44,7 @@
socket_close($socket);
--EXPECTF--
-Warning: socket_recvfrom(): unable to recvfrom [11]: Resource temporarily unavailable in %s on line %d
+Warning: socket_recvfrom(): unable to recvfrom [%d]: Resource temporarily unavailable in %s on line %d
Warning: Wrong parameter count for socket_sendto() in %s on line %d
Modified: php/php-src/trunk/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
===================================================================
--- php/php-src/trunk/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/trunk/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -49,9 +49,9 @@
@unlink($address);
?>
--EXPECTF--
-Warning: socket_create(): Unable to create socket [93]: Protocol not supported in %s on line %d
+Warning: socket_create(): Unable to create socket [%d]: Protocol not supported in %s on line %d
-Warning: socket_recvfrom(): unable to recvfrom [11]: Resource temporarily unavailable in %s on line %d
+Warning: socket_recvfrom(): unable to recvfrom [%d]: Resource temporarily unavailable in %s on line %d
Warning: socket_sendto() expects at least 5 parameters, 4 given in %s on line %d
bool(false)
Modified: php/php-src/trunk/ext/sockets/tests/socket_set_block-retval.phpt
===================================================================
--- php/php-src/trunk/ext/sockets/tests/socket_set_block-retval.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/trunk/ext/sockets/tests/socket_set_block-retval.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -9,11 +9,11 @@
--FILE--
<?php
-$socket = socket_create_listen(31337);
+$socket = socket_create_listen(31339);
var_dump(socket_set_block($socket));
socket_close($socket);
-$socket2 = socket_create_listen(31338);
+$socket2 = socket_create_listen(31340);
socket_close($socket2);
var_dump(socket_set_block($socket2));
Modified: php/php-src/trunk/ext/sockets/tests/socket_set_nonblock-retval.phpt
===================================================================
--- php/php-src/trunk/ext/sockets/tests/socket_set_nonblock-retval.phpt 2009-08-09 14:41:31 UTC (rev 286952)
+++ php/php-src/trunk/ext/sockets/tests/socket_set_nonblock-retval.phpt 2009-08-09 14:50:51 UTC (rev 286953)
@@ -9,11 +9,11 @@
--FILE--
<?php
-$socket = socket_create_listen(31337);
+$socket = socket_create_listen(31339);
var_dump(socket_set_nonblock($socket));
socket_close($socket);
-$socket2 = socket_create_listen(31338);
+$socket2 = socket_create_listen(31340);
socket_close($socket2);
var_dump(socket_set_nonblock($socket2));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
