Merge c4f351a into e24e29f

agronholm · Jan 3, 2018 · 94fb4d2 · 94fb4d2
2 parents e24e29f + c4f351a
commit 94fb4d2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/apscheduler/triggers/cron/__init__.py b/apscheduler/triggers/cron/__init__.py
@@ -194,6 +194,10 @@ def get_next_fire_time(self, previous_fire_time, now):
         if fieldnum >= 0:
             if self.jitter is not None:
                 next_date = self._apply_jitter(next_date, self.jitter, now)
+
+                if self.end_date and next_date > self.end_date:
+                    return None
+
             return next_date
 
     def __getstate__(self):

diff --git a/tests/test_triggers.py b/tests/test_triggers.py
@@ -347,6 +347,15 @@ def test_jitter_produces_differrent_valid_results(self, timezone):
 
         assert 1 < len(results)
 
+    def test_jitter_with_end_date(self, timezone):
+        now = timezone.localize(datetime(2017, 11, 12, 6, 55, 30))
+        end_date = timezone.localize(datetime(2017, 11, 12, 6, 56, 0))
+        trigger = CronTrigger(minute='*', jitter=5, end_date=end_date)
+
+        for _ in range(0, 100):
+            next_fire_time = trigger.get_next_fire_time(None, now)
+            assert next_fire_time is None or next_fire_time <= end_date
+
     def test_jitter_with_timezone(self, timezone):
         est = pytz.FixedOffset(-300)
         cst = pytz.FixedOffset(-360)
@@ -559,6 +568,15 @@ def test_jitter_produces_different_valid_results(self, timezone):
             assert timedelta(seconds=2) <= (next_fire_time - now) <= timedelta(seconds=8)
         assert 1 < len(results)
 
+    def test_jitter_with_end_date(self, timezone):
+        now = timezone.localize(datetime(2017, 11, 12, 6, 55, 58))
+        end_date = timezone.localize(datetime(2017, 11, 12, 6, 56, 0))
+        trigger = IntervalTrigger(seconds=5, jitter=5, end_date=end_date)
+
+        for _ in range(0, 100):
+            next_fire_time = trigger.get_next_fire_time(None, now)
+            assert next_fire_time is None or next_fire_time <= end_date
+
     @pytest.mark.parametrize('trigger_args, start_date, start_date_dst, correct_next_date', [
         ({'hours': 1}, datetime(2013, 3, 10, 1, 35), False, datetime(2013, 3, 10, 3, 35)),
         ({'hours': 1}, datetime(2013, 11, 3, 1, 35), True, datetime(2013, 11, 3, 1, 35))