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

Merge remote-tracking branch 'remotes/gh-upstream/master' into 0.10 

# Conflicts:
#	fail2ban/tests/utils.py
pull/1614/merge
sebres 2017-04-20 21:54:56 +02:00
parent 17922b621c a0cf31903d
commit efd6fff7a0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fail2ban/tests/utils.py
View File

@ -262,7 +262,10 @@ def initTests(opts):
# persistently set time zone to CET (used in zone-related test-cases), # persistently set time zone to CET (used in zone-related test-cases),
# yoh: we need to adjust TZ to match the one used by Cyril so all the timestamps match # yoh: we need to adjust TZ to match the one used by Cyril so all the timestamps match
os.environ['TZ'] = 'Europe/Zurich' # This offset corresponds to Europe/Zurich timezone. Specifying it
# explicitly allows to avoid requiring tzdata package to be installed during
# testing. See https://bugs.debian.org/855920 for more information
os.environ['TZ'] = 'CET-01CEST-02,M3.5.0,M10.5.0'
time.tzset() time.tzset()
# set alternate now for time related test cases: # set alternate now for time related test cases:
MyTime.setAlternateNow(TEST_NOW) MyTime.setAlternateNow(TEST_NOW)