fix flaky socket tests

diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
index 689421011eaf10a929e0e1efb0c50fc056d7e098..bfee60d3ca895b919ebacaba8b51048c9f5d84dd 100644 (file)
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
@@ -5,54 +5,66 @@ Test if socket_recvfrom() receives data sent by socket_sendto() via IPv4 UDP
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
 }
+?>
 --FILE--
 <?php
-    $socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-    if (!$socket) {
-        die('Unable to create AF_INET socket');
-    }
-    if (!socket_set_nonblock($socket)) {
-        die('Unable to set nonblocking mode for socket');
-    }
+$socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+if (!$socket) {
+    die('Unable to create AF_INET socket');
+}
 
-    $address = '127.0.0.1';
-    socket_sendto($socket, '', 1, 0, $address); // cause warning
-    if (!socket_bind($socket, $address, 1223)) {
-        die("Unable to bind to $address:1223");
-    }
+if (!socket_bind($socket, '127.0.0.1', 0)) {
+    die(sprintf(
+        'An error occurred while binding socket: %s',
+        socket_strerror(socket_last_error($socket))));
+}
 
-       var_dump(socket_recvfrom($socket, $buf, 12, 0, $from, $port)); //false (EAGAIN - no warning)
+socket_getsockname($socket, $address, $port);
 
-    $msg = "Ping!";
-    $len = strlen($msg);
-    $bytes_sent = socket_sendto($socket, $msg, $len, 0, $address, 1223);
-    if ($bytes_sent == -1) {
-        die('An error occurred while sending to the socket');
-    } else if ($bytes_sent != $len) {
-        die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected');
-    }
+$msg = "Ping!";
+$len = strlen($msg);
+$sent = socket_sendto($socket, $msg, $len, 0, $address, $port);
+if ($sent === false) {
+    die(sprintf(
+        'An error occurred while sending to the socket: %s',
+        socket_strerror(socket_last_error($socket))));
+} else if ($sent != $len) {
+    die(sprintf(
+        '%d bytes have been sent instead of the %d bytes expected',
+        $sent, $len));
+}
 
-    $from = "";
-    $port = 0;
-    socket_recvfrom($socket, $buf, 12, 0); // cause warning
-    socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
-    $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
-    if ($bytes_received == -1) {
-        die('An error occurred while receiving from the socket');
-    } else if ($bytes_received != $len) {
-        die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected');
+$wants = $len;
+$recvd = 0;
+$buf   = null;
+
+while ($recvd < $len) {
+    $bytes = socket_recvfrom(
+        $socket, $buffering, $wants, 0, $address, $port);
+
+    if (($bytes === false) && ($errno = socket_last_error($socket))) {
+        if ($errno = SOCKET_EAGAIN) {
+            socket_clear_error($socket);
+            continue;
+        }
+
+        die(sprintf(
+            'An error occurred while sending to the socket: %s',
+            socket_strerror($errno)));
     }
-    echo "Received $buf from remote address $from and remote port $port" . PHP_EOL;
 
-    socket_close($socket);
---EXPECTF--
-Warning: Wrong parameter count for socket_sendto() in %s on line %d
-bool(false)
+    $recvd += $bytes;
+    $wants -= $bytes;
+    $buf .= $buffering;
+}
 
-Warning: socket_recvfrom() expects at least 5 parameters, 4 given in %s on line %d
+if ($recvd != $len) {
+    die(sprintf(
+        '%d bytes have been received instead of the %d bytes expected',
+        $recvd, $len));
+}
 
-Warning: Wrong parameter count for socket_recvfrom() in %s on line %d
-Received Ping! from remote address 127.0.0.1 and remote port 1223
---CREDITS--
-Falko Menge <mail at falko-menge dot de>
-PHP Testfest Berlin 2009-05-09
+echo "Received $buf from remote address $address and remote port $port" . PHP_EOL;
+?>
+--EXPECTF--
+Received Ping! from remote address %s and remote port %d

diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
index bd0790427773bd83bfe24cee7e2477aedc0fdf02..de16c5c580f5f5cfcd8b369c1d7ef9af478d4787 100644 (file)
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
@@ -9,53 +9,66 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
        die('skip Not valid for Windows');
 }
 require 'ipv6_skipif.inc';
+?>
 --FILE--
 <?php
-    $socket = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
-    if (!$socket) {
-        die('Unable to create AF_INET6 socket');
-    }
-    if (!socket_set_nonblock($socket)) {
-        die('Unable to set nonblocking mode for socket');
-    }
-    var_dump(socket_recvfrom($socket, $buf, 12, 0, $from, $port)); // false (EAGAIN, no warning)
-    $address = '::1';
-    socket_sendto($socket, '', 1, 0, $address); // cause warning
-    if (!socket_bind($socket, $address, 1223)) {
-        die("Unable to bind to $address:1223");
-    }
+$socket = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
+if (!$socket) {
+    die('Unable to create AF_INET6 socket');
+}
 
-    $msg = "Ping!";
-    $len = strlen($msg);
-    $bytes_sent = socket_sendto($socket, $msg, $len, 0, $address, 1223);
-    if ($bytes_sent == -1) {
-        die('An error occurred while sending to the socket');
-    } else if ($bytes_sent != $len) {
-        die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected');
-    }
+if (!socket_bind($socket, '::1', 0)) {
+    die(sprintf(
+        'An error occurred while binding socket: %s',
+        socket_strerror(socket_last_error($socket))));
+}
 
-    $from = "";
-    $port = 0;
-    socket_recvfrom($socket, $buf, 12, 0); // cause warning
-    socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
-    $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
-    if ($bytes_received == -1) {
-        die('An error occurred while receiving from the socket');
-    } else if ($bytes_received != $len) {
-        die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected');
-    }
-    echo "Received $buf from remote address $from and remote port $port" . PHP_EOL;
+socket_getsockname($socket, $address, $port);
 
-    socket_close($socket);
---EXPECTF--
-bool(false)
+$msg = "Ping!";
+$len = strlen($msg);
+$sent = socket_sendto($socket, $msg, $len, 0, $address, $port);
+if ($sent === false) {
+    die(sprintf(
+        'An error occurred while sending to the socket: %s',
+        socket_strerror(socket_last_error($socket))));
+} else if ($sent != $len) {
+    die(sprintf(
+        '%d bytes have been sent instead of the %d bytes expected',
+        $sent, $len));
+}
 
-Warning: Wrong parameter count for socket_sendto() in %s on line %d
+$wants = $len;
+$recvd = 0;
+$buf   = null;
 
-Warning: socket_recvfrom() expects at least 5 parameters, 4 given in %s on line %d
+while ($recvd < $len) {
+    $bytes = socket_recvfrom(
+        $socket, $buffering, $wants, 0, $address, $port);
 
-Warning: Wrong parameter count for socket_recvfrom() in %s on line %d
-Received Ping! from remote address ::1 and remote port 1223
---CREDITS--
-Falko Menge <mail at falko-menge dot de>
-PHP Testfest Berlin 2009-05-09
+    if (($bytes === false) && ($errno = socket_last_error($socket))) {
+        if ($errno = SOCKET_EAGAIN) {
+            socket_clear_error($socket);
+            continue;
+        }
+
+        die(sprintf(
+            'An error occurred while sending to the socket: %s',
+            socket_strerror($errno)));
+    }
+
+    $recvd += $bytes;
+    $wants -= $bytes;
+    $buf .= $buffering;
+}
+
+if ($recvd != $len) {
+    die(sprintf(
+        '%d bytes have been received instead of the %d bytes expected',
+        $recvd, $len));
+}
+
+echo "Received $buf from remote address $address and remote port $port" . PHP_EOL;
+?>
+--EXPECTF--
+Received Ping! from remote address %s and remote port %d