Merge branch '0.10' into 0.11

pull/2476/head
sebres 2019-07-09 20:07:59 +02:00
commit 439f97fc52
1 changed files with 1 additions and 1 deletions

View File

@ -277,7 +277,7 @@ def testSampleRegexsFactory(name, basedir):
except ValueError:
jsonTimeLocal = datetime.datetime.strptime(t, "%Y-%m-%dT%H:%M:%S.%f")
jsonTime = time.mktime(jsonTimeLocal.timetuple())
jsonTime += jsonTimeLocal.microsecond / 1000000
jsonTime += jsonTimeLocal.microsecond / 1000000.0
self.assertEqual(fail2banTime, jsonTime,
"UTC Time mismatch %s (%s) != %s (%s) (diff %.3f seconds)" %
(fail2banTime, time.strftime("%Y-%m-%dT%H:%M:%S", time.gmtime(fail2banTime)),