External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-21 07:47:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

add more tests for weird timezone/DST boundaries in schedules

Browse Source 
see: https://github.com/ansible/awx/pull/1024
This commit is contained in:
Ryan Petrello
2018-01-22 14:01:40 -05:00
parent 15906b7e3c
commit 9857c8272e
4 changed files with 160 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/models/schedules.py
View File

@@ -5,7 +5,7 @@ import re
import logging
import datetime
import dateutil.rrule
from dateutil.tz import gettz
from dateutil.tz import gettz, datetime_exists
# Django
from django.db import models
@@ -185,7 +185,11 @@ class Schedule(CommonModel, LaunchTimeConfig):
def update_computed_fields(self):
future_rs = Schedule.rrulestr(self.rrule, forceset=True)
next_run_actual = future_rs.after(now())
if next_run_actual is not None:
if not datetime_exists(next_run_actual):
# skip imaginary dates, like 2:30 on DST boundaries
next_run_actual = future_rs.after(next_run_actual)
next_run_actual = next_run_actual.astimezone(pytz.utc)
self.next_run = next_run_actual