pew
/
phenny
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix .head for errors and add test

master
mutantmonkey 2013-07-20 22:25:45 -07:00
parent 5eaea6a449
commit 899d063071
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/head.py
View File

@ -47,7 +47,10 @@ def head(phenny, input):
info = web.head(uri) info = web.head(uri)
info['status'] = '200' info['status'] = '200'
except web.HTTPError as e: except web.HTTPError as e:
if hasattr(e, 'code'):
return phenny.say(str(e.code)) return phenny.say(str(e.code))
else:
return phenny.say(str(e.response.status_code))
except web.ConnectionError: except web.ConnectionError:
return phenny.say("Can't connect to %s" % uri) return phenny.say("Can't connect to %s" % uri)

7
modules/test/test_head.py
View File

@ -21,6 +21,13 @@ class TestHead(unittest.TestCase):
'\d{2}:\d{2}:\d{2} UTC, [0-9\.]+ s$', out, flags=re.UNICODE) '\d{2}:\d{2}:\d{2} UTC, [0-9\.]+ s$', out, flags=re.UNICODE)
self.assertTrue(m) self.assertTrue(m)
def test_head_404(self):
input = Mock(group=lambda x: 'http://vtluug.org/trigger_404')
head(self.phenny, input)
out = self.phenny.say.call_args[0][0]
self.assertEqual(out, '404')
def test_header(self): def test_header(self):
input = Mock(group=lambda x: 'http://vtluug.org Server') input = Mock(group=lambda x: 'http://vtluug.org Server')
head(self.phenny, input) head(self.phenny, input)