Fix issue2550835

Race condition for testing geek date intervals

Author: schlatterbeck

CHANGES.txt

@@ -75,6 +75,10 @@ Fixed:
   done in the fix for issue2550802. (Thomas Arendsen Hein)
 - Fix batch.propchanged for transitive id properties (would result in a
   backtrace when trying to group by property.id)
+- Fix issue2550835 which tests for date-range queries with an interval
+  that depends on the local time. Put the queried date a little later to
+  avoid a race condition where the queried interval doesn't match the
+  date because the clock has advanced. (Ralf Schlatterbeck)
 
 Minor:
 - demo.py usage message improved: explains "nuke" now. (Bernhard Reiter)

test/db_test_base.py

@@ -1367,16 +1367,25 @@ def testFilteringRangeInterval(self):
 
     def testFilteringRangeGeekInterval(self):
         ae, filter, filter_iter = self.filteringSetup()
+        # Note: When querying, create date one minute later than the
+        # timespan later queried to avoid race conditions where the
+        # creation of the deadline is more than a second ago when
+        # queried -- in that case we wouldn't get the expected result.
+        # By extending the interval by a minute we would need a very
+        # slow machine for this test to fail :-)
         for issue in (
-                { 'deadline': date.Date('. -2d')},
-                { 'deadline': date.Date('. -1d')},
-                { 'deadline': date.Date('. -8d')},
+                { 'deadline': date.Date('. -2d') + date.Interval ('00:01')},
+                { 'deadline': date.Date('. -1d') + date.Interval ('00:01')},
+                { 'deadline': date.Date('. -8d') + date.Interval ('00:01')},
                 ):
             self.db.issue.create(**issue)
         for filt in filter, filter_iter:
             ae(filt(None, {'deadline': '-2d;'}), ['5', '6'])
             ae(filt(None, {'deadline': '-1d;'}), ['6'])
             ae(filt(None, {'deadline': '-1w;'}), ['5', '6'])
+            ae(filt(None, {'deadline': '. -2d;'}), ['5', '6'])
+            ae(filt(None, {'deadline': '. -1d;'}), ['6'])
+            ae(filt(None, {'deadline': '. -1w;'}), ['5', '6'])
 
     def testFilteringIntervalSort(self):
         # 1: '1:10'