From: Matteo Beccati <mbeccati@php.net>
Date: Thu, 1 Sep 2011 00:45:56 +0000 (+0000)
Subject: Fixed test randomly failing due to different error messages. Also added a skip
X-Git-Tag: php-5.3.9RC1~291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d66630f625ed0312c8a39f132d8ef2c0541470cd;p=php

Fixed test randomly failing due to different error messages. Also added a skip
section in case "fakeURL" resolves to an IP address, as some empty error
messages and HTML can be seen in the reports
---

diff --git a/ext/curl/tests/curl_error_basic.phpt b/ext/curl/tests/curl_error_basic.phpt
index c9aa9ef8a0..bd01847f00 100644
--- a/ext/curl/tests/curl_error_basic.phpt
+++ b/ext/curl/tests/curl_error_basic.phpt
@@ -4,7 +4,15 @@ curl_error() function - basic test for curl_error using a fake url
 Mattijs Hoitink mattijshoitink@gmail.com
 #Testfest Utrecht 2009
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php
+
+if (!extension_loaded("curl")) die("skip\n");
+
+$url = "fakeURL";
+$ip = gethostbyname($url);
+if ($ip != $url) die("skip 'fakeURL' resolves to $ip\n");
+
+?>
 --FILE--
 <?php
 /*
@@ -21,13 +29,13 @@ echo "== Testing curl_error with a fake URL ==\n";
 
 // cURL handler
 $ch = curl_init($url);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
-ob_start(); // start output buffering
 curl_exec($ch);
-echo "Error: " . curl_error($ch);
+var_dump(curl_error($ch));
 curl_close($ch);
 
 ?>
---EXPECT--
+--EXPECTF--
 == Testing curl_error with a fake URL ==
-Error: Couldn't resolve host 'fakeURL'
+string(%d) "%sfakeURL%s"