d73b74
From 3cd5b375e31fb98e4782dc3a77e7316ad9eb26cf Mon Sep 17 00:00:00 2001
d73b74
From: Daniel Stenberg <daniel@haxx.se>
d73b74
Date: Thu, 4 Oct 2018 15:34:13 +0200
d73b74
Subject: [PATCH] test320: strip out more HTML when comparing
d73b74
d73b74
To make the test case work with different gnutls-serv versions better.
d73b74
d73b74
Reported-by: Kamil Dudka
d73b74
Fixes #3093
d73b74
Closes #3094
d73b74
d73b74
Upstream-commit: 94ad57b0246b5658c2a9139dbe6a80efa4c4e2f3
d73b74
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
d73b74
---
d73b74
 tests/data/test320 | 24 ++++--------------------
d73b74
 1 file changed, 4 insertions(+), 20 deletions(-)
d73b74
d73b74
diff --git a/tests/data/test320 b/tests/data/test320
d73b74
index 457a11eb2..87311d4f2 100644
d73b74
--- a/tests/data/test320
d73b74
+++ b/tests/data/test320
d73b74
@@ -62,34 +62,18 @@ simple TLS-SRP HTTPS GET, check user in response
d73b74
 HTTP/1.0 200 OK
d73b74
 Content-type: text/html
d73b74
 
d73b74
-
d73b74
-<HTML><BODY>
d73b74
-<CENTER>

This is GnuTLS

</CENTER>
d73b74
-
d73b74
-
d73b74
-
d73b74
-
If your browser supports session resuming, then you should see the same session ID, when you press the reload button.
d73b74
-

Connected as user 'jsmith'.

d73b74
-

d73b74
-
d73b74
-Key Exchange:SRP
d73b74
-CompressionNULL
d73b74
-CipherAES-NNN-CBC
d73b74
-MACSHA1
d73b74
-CiphersuiteSRP_SHA_AES_NNN_CBC_SHA1

d73b74
-

Your HTTP header was:

Host: %HOSTIP:%HTTPTLSPORT
d73b74
+FINE
d73b74
 User-Agent: curl-test-suite
d73b74
 Accept: */*
d73b74
 
d73b74
-

d73b74
-</BODY></HTML>
d73b74
-
d73b74
 </file>
d73b74
 <stripfile>
d73b74
-s/^

Session ID:.*//

d73b74
+s/^

Connected as user 'jsmith'.*/FINE/

d73b74
 s/Protocol version:.*[0-9]//
d73b74
 s/GNUTLS/GnuTLS/
d73b74
 s/(AES[-_])\d\d\d([-_]CBC)/$1NNN$2/
d73b74
+s/^<.*\n//
d73b74
+s/^\n//
d73b74
 </stripfile>
d73b74
 </verify>
d73b74
 
d73b74
-- 
d73b74
2.17.1
d73b74