github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

ENH: basic testing for iso8601 code which had no explicit tests + spit out ValueError for incorrect type of input and ParseError otherwise

pull/352/head
Yaroslav Halchenko 2013-09-12 23:12:18 -04:00
parent abc75b3022
commit f1adf75b59
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fail2ban-testcases
View File

@ -167,6 +167,7 @@ tests.addTest(unittest.makeSuite(sockettestcase.Socket))
tests.addTest(unittest.makeSuite(misctestcase.HelpersTest)) tests.addTest(unittest.makeSuite(misctestcase.HelpersTest))
tests.addTest(unittest.makeSuite(misctestcase.SetupTest)) tests.addTest(unittest.makeSuite(misctestcase.SetupTest))
tests.addTest(unittest.makeSuite(misctestcase.TestsUtilsTest)) tests.addTest(unittest.makeSuite(misctestcase.TestsUtilsTest))
tests.addTest(unittest.makeSuite(misctestcase.CustomDateFormatsTest))
# Filter # Filter
if not opts.no_network: if not opts.no_network:

7
server/iso8601.py
View File

@ -111,7 +111,7 @@ def parse_date(datestring, default_timezone=UTC):
default. default.
""" """
if not isinstance(datestring, basestring): if not isinstance(datestring, basestring):
raise ParseError("Expecting a string %r" % datestring) raise ValueError("Expecting a string %r" % datestring)
m = ISO8601_REGEX.match(datestring) m = ISO8601_REGEX.match(datestring)
if not m: if not m:
raise ParseError("Unable to parse date string %r" % datestring) raise ParseError("Unable to parse date string %r" % datestring)
@ -121,6 +121,11 @@ def parse_date(datestring, default_timezone=UTC):
groups["fraction"] = 0 groups["fraction"] = 0
else: else:
groups["fraction"] = int(float("0.%s" % groups["fraction"]) * 1e6) groups["fraction"] = int(float("0.%s" % groups["fraction"]) * 1e6)
try:
return datetime(int(groups["year"]), int(groups["month"]), int(groups["day"]), return datetime(int(groups["year"]), int(groups["month"]), int(groups["day"]),
int(groups["hour"]), int(groups["minute"]), int(groups["second"]), int(groups["hour"]), int(groups["minute"]), int(groups["second"]),
int(groups["fraction"]), tz) int(groups["fraction"]), tz)
except Exception, e:
raise ParseError("Failed to create a valid datetime record due to: %s"
% e)

26
testcases/misctestcase.py
View File

@ -167,3 +167,29 @@ class TestsUtilsTest(unittest.TestCase):
# in this case compressed and not should be the same (?) # in this case compressed and not should be the same (?)
self.assertTrue(pindex > 10) # we should have some traceback self.assertTrue(pindex > 10) # we should have some traceback
self.assertEqual(s[:pindex], s[pindex+1:pindex*2 + 1]) self.assertEqual(s[:pindex], s[pindex+1:pindex*2 + 1])
from server import iso8601
import datetime
class CustomDateFormatsTest(unittest.TestCase):
def testIso8601(self):
date = iso8601.parse_date("2007-01-25T12:00:00Z")
self.assertEqual(
date,
datetime.datetime(2007, 1, 25, 12, 0, tzinfo=iso8601.Utc()))
self.assertRaises(ValueError, iso8601.parse_date, None)
self.assertRaises(ValueError, iso8601.parse_date, date)
self.assertRaises(iso8601.ParseError, iso8601.parse_date, "")
self.assertRaises(iso8601.ParseError, iso8601.parse_date, "Z")
self.assertRaises(iso8601.ParseError,
iso8601.parse_date, "2007-01-01T120:00:00Z")
self.assertRaises(iso8601.ParseError,
iso8601.parse_date, "2007-13-01T12:00:00Z")
def testTimeZone(self):
# Just verify consistent operation and improve coverage ;)
self.assertEqual(iso8601.parse_timezone(None), iso8601.UTC)
self.assertEqual(iso8601.parse_timezone('Z'), iso8601.UTC)