From a73fda7cf98662ab1ab2c15219fed6b0d9bece84 Mon Sep 17 00:00:00 2001
From: Dirk Wetter <dirk@testssl.sh>
Date: Tue, 9 Apr 2019 12:47:12 +0200
Subject: [PATCH] Fix travis

.. see previous commit
---
 t/31_badssl.com.t | 4 ++--
 t/32_http.t       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/t/31_badssl.com.t b/t/31_badssl.com.t
index 1952f5e..16c5aed 100755
--- a/t/31_badssl.com.t
+++ b/t/31_badssl.com.t
@@ -27,7 +27,7 @@ $json = json('tmp.json');
 unlink 'tmp.json';
 $found = 0;
 foreach my $f ( @$json ) {
-	if ( $f->{id} eq "cert_expiration_status" ) {
+	if ( $f->{id} eq "cert_expirationStatus" ) {
 		$found = 1;
 		like($f->{finding},qr/^expired/,"Finding reads expired."); $tests++;
 		is($f->{severity}, "CRITICAL", "Severity should be CRITICAL"); $tests++;
@@ -44,7 +44,7 @@ $json = json('tmp.json');
 unlink 'tmp.json';
 $found = 0;
 foreach my $f ( @$json ) {
-	if ( $f->{id} eq "cert_expiration_status" ) {
+	if ( $f->{id} eq "cert_expirationStatus" ) {
 		$found = 1;
 		like($f->{finding},qr/days/,"Finding doesn't read expired."); $tests++;
 		isnt($f->{severity}, "CRITICAL", "Severity should be OK, MEDIUM or HIGH"); $tests++;
diff --git a/t/32_http.t b/t/32_http.t
index 8cbfae3..15c1c9a 100755
--- a/t/32_http.t
+++ b/t/32_http.t
@@ -5,6 +5,7 @@ use Test::More;
 use Data::Dumper;
 
 my $tests = 0;
+unlink 'tmp.html';
 
 pass("Running testssl.sh against badssl.com to create HTML and terminal outputs (may take 2~3 minutes)"); $tests++;
 # specify a TERM_WIDTH so that the two calls to testssl.sh don't create HTML files with different values of TERM_WIDTH
@@ -49,6 +50,7 @@ $okhtml =~ s/HTTP clock skew              \+?-?[0-9]* /HTTP clock skew
 $debughtml =~ s/HTTP clock skew              \+?-?[0-9]* /HTTP clock skew              X /;
 
 $debughtml =~ s/ Pre-test: .*\n//g;
+$debughtml =~ s/.*OK: below 5 years.*\n//g;
 
 pass("Checking that using the --debug option doesn't affect the HTML file"); $tests++;
 cmp_ok($debughtml, "eq", $okhtml, "HTML file created with --debug 4 matches HTML file created without --debug"); $tests++;