stas Mon, 26 Dec 2011 03:22:07 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=321401
Log:
test fixes
Changed paths:
U php/php-src/branches/PHP_5_4/ext/soap/tests/bugs/bug31422.phpt
U php/php-src/branches/PHP_5_4/ext/sockets/tests/mcast_ipv6_send.phpt
U
php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_import_stream-3.phpt
U
php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_set_option_seolinger.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt
U php/php-src/trunk/ext/soap/tests/bugs/bug31422.phpt
U php/php-src/trunk/ext/sockets/tests/mcast_ipv6_send.phpt
U php/php-src/trunk/ext/sockets/tests/socket_import_stream-3.phpt
U php/php-src/trunk/ext/sockets/tests/socket_set_option_seolinger.phpt
U php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt
Modified: php/php-src/branches/PHP_5_4/ext/soap/tests/bugs/bug31422.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/soap/tests/bugs/bug31422.phpt
2011-12-26 02:56:02 UTC (rev 321400)
+++ php/php-src/branches/PHP_5_4/ext/soap/tests/bugs/bug31422.phpt
2011-12-26 03:22:07 UTC (rev 321401)
@@ -4,6 +4,7 @@
<?php require_once('skipif.inc'); ?>
--INI--
log_errors=1
+error_log=
--FILE--
<?php
function Add($x,$y) {
Modified: php/php-src/branches/PHP_5_4/ext/sockets/tests/mcast_ipv6_send.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/sockets/tests/mcast_ipv6_send.phpt
2011-12-26 02:56:02 UTC (rev 321400)
+++ php/php-src/branches/PHP_5_4/ext/sockets/tests/mcast_ipv6_send.phpt
2011-12-26 03:22:07 UTC (rev 321401)
@@ -8,6 +8,8 @@
if (!defined('IPPROTO_IPV6')) {
die('skip IPv6 not available.');
}
+$level = IPPROTO_IPV6;
+$s = socket_create($domain, SOCK_DGRAM, SOL_UDP) or die("skip Can not create
socket");
if (socket_set_option($s, $level, IP_MULTICAST_IF, 1) === false) {
die("skip interface 1 either doesn't exist or has no ipv6 address");
}
Modified:
php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_import_stream-3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_import_stream-3.phpt
2011-12-26 02:56:02 UTC (rev 321400)
+++ php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_import_stream-3.phpt
2011-12-26 03:22:07 UTC (rev 321401)
@@ -13,7 +13,7 @@
"group" => '224.0.0.23',
"interface" => "lo",
));
-if ($br === false)
+if ($so === false)
die("SKIP joining group 224.0.0.23 on interface lo failed");
--FILE--
<?php
Modified:
php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_set_option_seolinger.phpt
===================================================================
---
php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_set_option_seolinger.phpt
2011-12-26 02:56:02 UTC (rev 321400)
+++
php/php-src/branches/PHP_5_4/ext/sockets/tests/socket_set_option_seolinger.phpt
2011-12-26 03:22:07 UTC (rev 321401)
@@ -1,8 +1,8 @@
--TEST--
Test if socket_set_option() works, option:SO_SEOLINGER
--DESCRIPTION--
--wrong params
--set/get params comparison
+-wrong params
+-set/get params comparison
-l_linger not given
--SKIPIF--
<?php
@@ -30,7 +30,9 @@
var_dump(socket_set_option( $socket, SOL_SOCKET, SO_LINGER, $options_2));
var_dump($retval_2);
-var_dump($retval_3 === $options);
+var_dump($retval_3["l_linger"] === $options["l_linger"]);
+// value of l_onoff is not always 1, Darwin returns 128
+var_dump((bool)$retval_3["l_onoff"] === (bool)$options["l_onoff"]);
socket_close($socket);
?>
@@ -42,6 +44,7 @@
bool(false)
bool(true)
bool(true)
+bool(true)
--CREDITS--
Moritz Neuhaeuser, i...@xcompile.net
PHP Testfest Berlin 2009-05-10
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt
2011-12-26 02:56:02 UTC (rev 321400)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt
2011-12-26 03:22:07 UTC (rev 321401)
@@ -4,10 +4,10 @@
<?php
$sock = pfsockopen('udp://127.0.0.1', '63844');
var_dump((int)$sock);
-fwrite($sock, "1");
+@fwrite($sock, "1");
$sock2 = pfsockopen('udp://127.0.0.1', '63844');
var_dump((int)$sock2);
-fwrite($sock2, "2");
+@fwrite($sock2, "2");
fclose($sock2);
fwrite($sock, "3");
--EXPECTF--
Modified: php/php-src/trunk/ext/soap/tests/bugs/bug31422.phpt
===================================================================
--- php/php-src/trunk/ext/soap/tests/bugs/bug31422.phpt 2011-12-26 02:56:02 UTC
(rev 321400)
+++ php/php-src/trunk/ext/soap/tests/bugs/bug31422.phpt 2011-12-26 03:22:07 UTC
(rev 321401)
@@ -4,6 +4,7 @@
<?php require_once('skipif.inc'); ?>
--INI--
log_errors=1
+error_log=
--FILE--
<?php
function Add($x,$y) {
Modified: php/php-src/trunk/ext/sockets/tests/mcast_ipv6_send.phpt
===================================================================
--- php/php-src/trunk/ext/sockets/tests/mcast_ipv6_send.phpt 2011-12-26
02:56:02 UTC (rev 321400)
+++ php/php-src/trunk/ext/sockets/tests/mcast_ipv6_send.phpt 2011-12-26
03:22:07 UTC (rev 321401)
@@ -8,6 +8,8 @@
if (!defined('IPPROTO_IPV6')) {
die('skip IPv6 not available.');
}
+$level = IPPROTO_IPV6;
+$s = socket_create($domain, SOCK_DGRAM, SOL_UDP) or die("skip Can not create
socket");
if (socket_set_option($s, $level, IP_MULTICAST_IF, 1) === false) {
die("skip interface 1 either doesn't exist or has no ipv6 address");
}
Modified: php/php-src/trunk/ext/sockets/tests/socket_import_stream-3.phpt
===================================================================
--- php/php-src/trunk/ext/sockets/tests/socket_import_stream-3.phpt
2011-12-26 02:56:02 UTC (rev 321400)
+++ php/php-src/trunk/ext/sockets/tests/socket_import_stream-3.phpt
2011-12-26 03:22:07 UTC (rev 321401)
@@ -13,7 +13,7 @@
"group" => '224.0.0.23',
"interface" => "lo",
));
-if ($br === false)
+if ($so === false)
die("SKIP joining group 224.0.0.23 on interface lo failed");
--FILE--
<?php
Modified: php/php-src/trunk/ext/sockets/tests/socket_set_option_seolinger.phpt
===================================================================
--- php/php-src/trunk/ext/sockets/tests/socket_set_option_seolinger.phpt
2011-12-26 02:56:02 UTC (rev 321400)
+++ php/php-src/trunk/ext/sockets/tests/socket_set_option_seolinger.phpt
2011-12-26 03:22:07 UTC (rev 321401)
@@ -1,8 +1,8 @@
--TEST--
Test if socket_set_option() works, option:SO_SEOLINGER
--DESCRIPTION--
--wrong params
--set/get params comparison
+-wrong params
+-set/get params comparison
-l_linger not given
--SKIPIF--
<?php
@@ -30,7 +30,9 @@
var_dump(socket_set_option( $socket, SOL_SOCKET, SO_LINGER, $options_2));
var_dump($retval_2);
-var_dump($retval_3 === $options);
+var_dump($retval_3["l_linger"] === $options["l_linger"]);
+// value of l_onoff is not always 1, Darwin returns 128
+var_dump((bool)$retval_3["l_onoff"] === (bool)$options["l_onoff"]);
socket_close($socket);
?>
@@ -42,6 +44,7 @@
bool(false)
bool(true)
bool(true)
+bool(true)
--CREDITS--
Moritz Neuhaeuser, i...@xcompile.net
PHP Testfest Berlin 2009-05-10
Modified: php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt 2011-12-26
02:56:02 UTC (rev 321400)
+++ php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt 2011-12-26
03:22:07 UTC (rev 321401)
@@ -4,10 +4,10 @@
<?php
$sock = pfsockopen('udp://127.0.0.1', '63844');
var_dump((int)$sock);
-fwrite($sock, "1");
+@fwrite($sock, "1");
$sock2 = pfsockopen('udp://127.0.0.1', '63844');
var_dump((int)$sock2);
-fwrite($sock2, "2");
+@fwrite($sock2, "2");
fclose($sock2);
fwrite($sock, "3");
--EXPECTF--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
