From c7059c9751682399f7d9b1c912d1aab536805c4c Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Thu, 11 Aug 2016 22:25:27 -0700
Subject: [PATCH] travis: Update success-http-headers to match current certs.

Travis CI seems to have changed the way the snakeoil SSL certs are
generated in their infrastructure, so we need to update our expected
"success" HTTP headers accordingly.
---
 tools/lint-all                        | 3 ++-
 tools/travis/production-helper        | 2 +-
 tools/travis/success-http-headers.txt | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/lint-all b/tools/lint-all
index a74f9f15b3..6cf3fa7c4f 100755
--- a/tools/lint-all
+++ b/tools/lint-all
@@ -146,7 +146,8 @@ whitespace_rules = [
      'description': 'Fix trailing whitespace'},
     {'pattern': '\t',
      'strip': '\n',
-     'exclude': set(['zerver/lib/bugdown/codehilite.py']),
+     'exclude': set(['zerver/lib/bugdown/codehilite.py',
+                     'tools/travis/success-http-headers.txt']),
      'description': 'Fix tab-based whitespace'},
     ] # type: RuleList
 markdown_whitespace_rules = list([rule for rule in whitespace_rules if rule['pattern'] != '\s+$']) + [
diff --git a/tools/travis/production-helper b/tools/travis/production-helper
index c2fad2b4af..2901d9be70 100755
--- a/tools/travis/production-helper
+++ b/tools/travis/production-helper
@@ -44,7 +44,7 @@ su zulip -c /home/zulip/deployments/current/scripts/setup/initialize-database
 echo; echo "Now testing that the newly installed server's homepage loads"; echo
 
 wget https://localhost -O /tmp/index.html --no-check-certificate -S 2> /tmp/wget-output
-grep -vi '\(Vary\|Content-Language\|expires\|modified\|saved\|[.][.][.]\|Date\|[-][-]\)' /tmp/wget-output > /tmp/http-headers-processed
+grep -vi '\(Vary\|Content-Language\|expires\|issued by\|modified\|saved\|[.][.][.]\|Date\|[-][-]\)' /tmp/wget-output > /tmp/http-headers-processed
 if ! diff -ur /tmp/http-headers-processed ~/success-http-headers.txt; then
     set +x
     echo
diff --git a/tools/travis/success-http-headers.txt b/tools/travis/success-http-headers.txt
index b830a30150..b66fa6441f 100644
--- a/tools/travis/success-http-headers.txt
+++ b/tools/travis/success-http-headers.txt
@@ -1,4 +1,6 @@
-The certificate's owner does not match hostname ‘localhost’
+  Self-signed certificate encountered.
+WARNING: no certificate subject alternative name matches
+	requested host name ‘localhost’.
   HTTP/1.1 302 FOUND
   Server: nginx/1.4.6 (Ubuntu)
   Content-Type: text/html; charset=utf-8