better skipif

php · Jun 27, 2023 · 1606f89 · 1606f89
1 parent a25ad19
commit 1606f89
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/ext/curl/tests/Caddyfile b/ext/curl/tests/Caddyfile
@@ -5,6 +5,8 @@
 
 localhost
 
+respond / "Caddy is up and running"
+
 # HTTP/2 Server Push
 respond /serverpush "main response"
 respond /serverpush/pushed "pushed response"

diff --git a/ext/curl/tests/bug76675.phpt b/ext/curl/tests/bug76675.phpt
@@ -4,9 +4,8 @@ Bug #76675 (Segfault with H2 server push write/writeheader handlers)
 curl
 --SKIPIF--
 <?php
-if (!@fsockopen("localhost", 443, $errno, $errstr, 0.5)) {
-    die("skip test needs Caddy");
-}
+include 'skipif-nocaddy.inc';
+
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x073d00) {
     exit("skip: test may crash with curl < 7.61.0");

diff --git a/ext/curl/tests/bug77535.phpt b/ext/curl/tests/bug77535.phpt
@@ -4,9 +4,8 @@ Bug #77535 (Invalid callback, h2 server push)
 curl
 --SKIPIF--
 <?php
-if (!@fsockopen("localhost", 443, $errno, $errstr, 0.5)) {
-    die("skip test needs Caddy");
-}
+include 'skipif-nocaddy.inc';
+
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x073d00) {
     exit("skip: test may crash with curl < 7.61.0");

diff --git a/ext/curl/tests/curl_pushfunction.phpt b/ext/curl/tests/curl_pushfunction.phpt
@@ -7,9 +7,8 @@ Kévin Dunglas
 curl
 --SKIPIF--
 <?php
-if (!@fsockopen("localhost", 443, $errno, $errstr, 0.5)) {
-    die("skip test needs Caddy");
-}
+include 'skipif-nocaddy.inc';
+
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x073d00) {
     exit("skip: test may crash with curl < 7.61.0");

diff --git a/ext/curl/tests/skipif-nocaddy.inc b/ext/curl/tests/skipif-nocaddy.inc
@@ -0,0 +1,12 @@
+<?php
+
+$ch = curl_init("https://localhost");
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+$body = curl_exec($ch);
+
+curl_close($ch);
+
+if ($body !== "Caddy is up and running") {
+    die("skip test needs Caddy");
+}