From: andy wharmby <wharmby@php.net>
Date: Fri, 23 Jan 2009 23:49:40 +0000 (+0000)
Subject: Make test more robust; avoid hangs if fsockopen() fails. Tested on Windows, Linux... 
X-Git-Tag: php-5.4.0alpha1~191^2~4406
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=555ff7b176a8ddeedb3eb2eaacdbdb39e054243e;p=php

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

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 ae58b6a619..4883644387 100644
--- 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 9511a43025..6c856bddc3 100644
--- 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 92c9a81505..9de4b099f9 100644
--- 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 e8a0941f3b..1ce0dbf3d1 100644
--- 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");