]> granicus.if.org Git - curl/commitdiff
test320: strip out more HTML when comparing
authorDaniel Stenberg <daniel@haxx.se>
Thu, 4 Oct 2018 13:34:13 +0000 (15:34 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Thu, 4 Oct 2018 21:20:25 +0000 (23:20 +0200)
To make the test case work with different gnutls-serv versions better.

Reported-by: Kamil Dudka
Fixes #3093
Closes #3094

tests/data/test320

index 457a11eb24d50e0ddce5c9acf32c684ee19135cf..87311d4f2032d23c6451ca4b3c8f362145858372 100644 (file)
@@ -62,34 +62,18 @@ simple TLS-SRP HTTPS GET, check user in response
 HTTP/1.0 200 OK\r
 Content-type: text/html\r
 \r
-
-<HTML><BODY>
-<CENTER><H1>This is <a href="http://www.gnu.org/software/gnutls">GnuTLS</a></H1></CENTER>
-
-
-
-<h5>If your browser supports session resuming, then you should see the same session ID, when you press the <b>reload</b> button.</h5>
-<p>Connected as user 'jsmith'.</p>
-<P>
-<TABLE border=1><TR><TD></TD></TR>
-<TR><TD>Key Exchange:</TD><TD>SRP</TD></TR>
-<TR><TD>Compression</TD><TD>NULL</TD></TR>
-<TR><TD>Cipher</TD><TD>AES-NNN-CBC</TD></TR>
-<TR><TD>MAC</TD><TD>SHA1</TD></TR>
-<TR><TD>Ciphersuite</TD><TD>SRP_SHA_AES_NNN_CBC_SHA1</TD></TR></p></TABLE>
-<hr><P>Your HTTP header was:<PRE>Host: %HOSTIP:%HTTPTLSPORT\r
+FINE
 User-Agent: curl-test-suite\r
 Accept: */*\r
 \r
-</PRE></P>
-</BODY></HTML>
-
 </file>
 <stripfile>
-s/^<p>Session ID:.*//
+s/^<p>Connected as user 'jsmith'.*/FINE/
 s/Protocol version:.*[0-9]//
 s/GNUTLS/GnuTLS/
 s/(AES[-_])\d\d\d([-_]CBC)/$1NNN$2/
+s/^<.*\n//
+s/^\n//
 </stripfile>
 </verify>