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 00174c475724289989c1dcf6842f5bb520303f95..16b38d9a1bb832b758f98453c526403c4a02dd57 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 9b74680a87e7913378d27b80d77e30226013e506..d30fec7056ae7b7269c7c4fde4f025797f254c87 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 abd0e2046d5e0bca069eb5df440ad149af19f3af..0b079ccf7c4a05745da934e7b82a961ab8f76c4f 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 4c57dbe78e864facf674047940499990077eb03f..f9ef747987331cd8d24275ebc32b32d456121e51 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");