test 320 started to fail after upgrade to gnutls-3.6.4

[kdudka]

test 320 started to fail after upgrade to gnutls-3.6.4

I did this

$ ./runtests.pl 320
********* System characteristics ******** 
* curl 7.62.0-DEV (x86_64-pc-linux-gnu) 
* libcurl/7.62.0-DEV OpenSSL/1.1.1 zlib/1.2.11 brotli/1.0.5 libidn2/2.0.5 libpsl/0.20.2 (+libidn2/2.0.5) nghttp2/1.33.0
* Features: AsynchDNS Debug IDN IPv6 Largefile NTLM NTLM_WB SSL libz brotli TLS-SRP HTTP2 UnixSockets HTTPS-proxy PSL 
* Host: f30
* System: Linux f30 4.13.0-0.rc7.git0.1.fc28.x86_64 #1 SMP Mon Aug 28 02:31:43 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux
* Servers: SSL HTTP-IPv6 HTTP-unix FTP-IPv6 
* Env: Valgrind 
***************************************** 
test 0320...[simple TLS-SRP HTTPS GET, check user in response]

 320: output (log/curl320.out) FAILED:
--- log/check-expected  2018-10-04 13:28:57.639650872 +0200
+++ log/check-generated 2018-10-04 13:28:57.639650872 +0200
@@ -7,15 +7,16 @@
 [LF]
 [LF]
 [LF]
-<h5>If your browser supports session resuming, then you should see the same session ID, when you press the <b>reload</b> button.</h5>[LF]
+<h5>If your browser supports session resumption, then you should see the same session ID, when you press the <b>reload</b> button.</h5>[LF]
 <p>Connected as user 'jsmith'.</p>[LF]
 <P>[LF]
 <TABLE border=1><TR><TD></TD></TR>[LF]
+<TR><TD>Description:</TD><TD>(TLS1.2)-(SRP)-(AES-NNN-CBC)-(SHA1)</TD></TR>[LF]
 <TR><TD>Key Exchange:</TD><TD>SRP</TD></TR>[LF]
 <TR><TD>Compression</TD><TD>NULL</TD></TR>[LF]
+<TR><TD>Ciphersuite</TD><TD>SRP_SHA_AES_NNN_CBC_SHA1</TD></TR></p></TABLE>[LF]
 <TR><TD>Cipher</TD><TD>AES-NNN-CBC</TD></TR>[LF]
 <TR><TD>MAC</TD><TD>SHA1</TD></TR>[LF]
-<TR><TD>Ciphersuite</TD><TD>SRP_SHA_AES_NNN_CBC_SHA1</TD></TR></p></TABLE>[LF]
 <hr><P>Your HTTP header was:<PRE>Host: 127.0.0.1:9011[CR][LF]
 User-Agent: curl-test-suite[CR][LF]
 Accept: */*[CR][LF]

 - abort tests
TESTDONE: 0 tests out of 1 reported OK: 0%
TESTFAIL: These test cases failed: 320 
TESTDONE: 1 tests were considered during 13 seconds.

I expected the following

Success.

curl/libcurl version

curl-7_61_1-131-g5fdac8d4f

operating system

$ uname -a
Linux f30 4.13.0-0.rc7.git0.1.fc28.x86_64 #1 SMP Mon Aug 28 02:31:43 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux

[nmav]

Is there some way I can help from gnutls side?

[dfandrich]

The problem with this test is that it parses the output of gnutls-serv which isn't that stable between releases. After a quick glance, it looks like the test just needs a few more entries in the <stripfile> section to canonicalize the output program further so that the string comparison will still work on this new version.

[bagder]

Indeed, we should focus on just seeing the user name in the content. I'll push a PR in a sec.