test1518: adjusted to work with hyper

... by making sure the stdout output doesn't look like HTTP headers.

Closes #7333

diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 27b2dcabbf223a7648a18b56283f00b41115fa87..1bada9af2b4562ebb43de3f988526f24bd4bdb8d 100644 (file)
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -120,7 +120,6 @@
 1432
 1455
 1456
-1518
 1519
 1525
 1526

diff --git a/tests/data/test1518 b/tests/data/test1518
index e1d0d5ceca75f24837dfb3c2dfe1c128e3b06e09..9b3f6be6051ce4a1c5c6470608604c91f8f2a991 100644 (file)
--- a/tests/data/test1518
+++ b/tests/data/test1518
@@ -49,11 +49,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <protocol>
 </protocol>
 <stdout>
-res: 0
-status: 302
-redirects: 0
-effectiveurl: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
-redirecturl: http://1.2 .4.5/test
+res 0
+status 302
+redirects 0
+effectiveurl http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+redirecturl http://1.2 .4.5/test
 </stdout>
 <errorcode>
 0

diff --git a/tests/libtest/lib1518.c b/tests/libtest/lib1518.c
index 1f2fe3de0b4d37e648450cc9bf8da0bd3da3887b..8c4687885f870e22b95512b13d5ad77f198fd5de 100644 (file)
--- a/tests/libtest/lib1518.c
+++ b/tests/libtest/lib1518.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -53,11 +53,11 @@ int test(char *URL)
   curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effectiveUrl);
   curl_easy_getinfo(curl, CURLINFO_REDIRECT_URL, &redirectUrl);
 
-  printf("res: %d\n"
-         "status: %d\n"
-         "redirects: %d\n"
-         "effectiveurl: %s\n"
-         "redirecturl: %s\n",
+  printf("res %d\n"
+         "status %d\n"
+         "redirects %d\n"
+         "effectiveurl %s\n"
+         "redirecturl %s\n",
          (int)res,
          (int)curlResponseCode,
          (int)curlRedirectCount,