Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Tim Abbott 2016-08-11 22:25:27 -07:00
parent b0e6d20321
commit c7059c9751
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/lint-all
View File

@ -146,7 +146,8 @@ whitespace_rules = [
'description': 'Fix trailing whitespace'}, 'description': 'Fix trailing whitespace'},
{'pattern': '\t', {'pattern': '\t',
'strip': '\n', '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'}, 'description': 'Fix tab-based whitespace'},
] # type: RuleList ] # type: RuleList
markdown_whitespace_rules = list([rule for rule in whitespace_rules if rule['pattern'] != '\s+$']) + [ markdown_whitespace_rules = list([rule for rule in whitespace_rules if rule['pattern'] != '\s+$']) + [

2
tools/travis/production-helper
View File

@ -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 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 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 if ! diff -ur /tmp/http-headers-processed ~/success-http-headers.txt; then
set +x set +x
echo echo

4
tools/travis/success-http-headers.txt
View File

@ -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 HTTP/1.1 302 FOUND
Server: nginx/1.4.6 (Ubuntu) Server: nginx/1.4.6 (Ubuntu)
Content-Type: text/html; charset=utf-8 Content-Type: text/html; charset=utf-8