Make test more robust; avoid hangs if fsockopen() fails. Tested on Windows, Linux...

diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
index ae58b6a6190a3be3b3996844e8c4073dc5056630..4883644387117da3e23c7140052389a9a85f6183 100644 (file)
--- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
@@ -5,21 +5,15 @@ Testing stream_get_meta_data() "unread_bytes" field on a udp socket
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
-if ($server === false) {
-       die("stream_socket_server() failed\n");
-}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
-if ($client === false) {
-       die("fsockopen() failed\n");
+if (!$client) {
+       die("Unable to create socket");
 }
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
-if ($socket === false) {
-       die("stream_socket_accept() failed\n");
-}
 
 echo "Write some data:\n";
 fwrite($socket, "abcdefg\n1234567\nxyzxyz\n");

diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
index 9511a4302518f72551b32f99af7f7878ada7e798..6c856bddc36ddd262b35db0150c71febd662b1b4 100644 (file)
--- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
@@ -5,21 +5,15 @@ Testing stream_get_meta_data() "timed_out" field on a udp socket
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
-if ($server === false) {
-       die("stream_socket_server() failed\n");
-}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
-if ($client === false) {
-       die("fsockopen() failed\n");
+if (!$client) {
+       die("Unable to create socket");
 }
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
-if ($socket === false) {
-       die("stream_socket_accept() failed\n");
-}
 
 var_dump(stream_get_meta_data($client));
 

diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
index 92c9a81505afd8e82b9f91d2816b403257f4477b..9de4b099f9dab100a0422686375d8c85d5f65d77 100644 (file)
--- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
@@ -5,21 +5,15 @@ Testing stream_get_meta_data() "blocked" field on a udp socket
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
-if ($server === false) {
-       die("stream_socket_server() failed\n");
-}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
-if ($client === false) {
-       die("fsockopen() failed\n");
+if (!$client) {
+       die("Unable to create socket");
 }
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
-if ($socket === false) {
-       die("stream_socket_accept() failed\n");
-}
 
 var_dump(stream_get_meta_data($client));
 

diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
index e8a0941f3b75c0c05bd15f6ad63f199d2bfc475b..1ce0dbf3d1a62862d2c3e13498ace67189e28ac8 100644 (file)
--- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
@@ -5,21 +5,15 @@ Testing stream_get_meta_data() "eof" field on a udp socket
 
 /* Setup socket server */
 $server = stream_socket_server('tcp://127.0.0.1:31337');
-if ($server === false) {
-       die("stream_socket_server() failed\n");
-}
 
 /* Connect to it */
 $client = fsockopen('tcp://127.0.0.1:31337');
-if ($client === false) {
-       die("fsockopen() failed\n");
+if (!$client) {
+       die("Unable to create socket");
 }
 
 /* Accept that connection */
 $socket = stream_socket_accept($server);
-if ($socket === false) {
-       die("stream_socket_accept() failed\n");
-}
 
 echo "Write some data:\n";
 fwrite($socket, "abcdefg\n1234567\nxyzxyz\n");