Merge branch 'master' of /users/git/public/csc-status

Conflicts:
	tests.d/50_website.py
This commit is contained in:
Matthew McPherrin 2012-10-17 19:28:08 -04:00
commit 365e27f9e4
1 changed files with 7 additions and 4 deletions

View File

@ -1,7 +1,9 @@
#!/usr/bin/env python
import urllib2, sys
pages=["https://csclub.uwaterloo.ca", "http://mirror.csclub.uwaterloo.ca", "http://git.csclub.uwaterloo.ca"]
pages=["https://csclub.uwaterloo.ca",
"http://mirror.csclub.uwaterloo.ca",
"http://git.csclub.uwaterloo.ca"]
for page in pages:
try:
@ -13,9 +15,10 @@ for page in pages:
if not"Computer Science Club" in page:
print "FAIL, homepage doesn't mention Computer Science Club"
sys.exit(3)
# So read() didn't throw an exception, nor did opening,
# and we have enough data, so likely good.
sys.exit(0)
except urllib2.URLError as e:
print "FAIL, exception ", e
sys.exit(1)
# So read() didn't throw an exception, nor did opening,
# and we have enough data, so likely good.
sys.exit(0)