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

This is GnuTLS

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

Connected as user 'jsmith'.

6c95600
-

6c95600
-
6c95600
-Key Exchange:SRP
6c95600
-CompressionNULL
6c95600
-CipherAES-NNN-CBC
6c95600
-MACSHA1
6c95600
-CiphersuiteSRP_SHA_AES_NNN_CBC_SHA1

6c95600
-

Your HTTP header was:

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

6c95600
-</BODY></HTML>
6c95600
-
6c95600
 </file>
6c95600
 <stripfile>
6c95600
-s/^

Session ID:.*//

6c95600
+s/^

Connected as user 'jsmith'.*/FINE/

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