Changeset 258937 in webkit
- Timestamp:
- Mar 24, 2020 1:36:30 PM (4 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
r258790 r258937 24 24 25 25 import datetime 26 import logging 26 27 import re 27 28 … … 35 36 from ews.models.patch import Patch 36 37 import ews.config as config 38 39 _log = logging.getLogger(__name__) 37 40 38 41 … … 111 114 elif build.result == Buildbot.SUCCESS: 112 115 if is_parent_build: 113 if patch. modified < (timezone.now() - datetime.timedelta(days=StatusBubble.DAYS_TO_CHECK)):116 if patch.created < (timezone.now() - datetime.timedelta(days=StatusBubble.DAYS_TO_CHECK)): 114 117 # Do not display bubble for old patch for which no build has been reported on given queue. 115 118 # Most likely the patch would never be processed on this queue, since either the queue was … … 271 274 from_timestamp = timezone.now() - datetime.timedelta(days=StatusBubble.DAYS_TO_CHECK) 272 275 273 if patch. modified < from_timestamp:276 if patch.created < from_timestamp: 274 277 # Do not display bubble for old patch for which no build has been reported on given queue. 275 278 # Most likely the patch would never be processed on this queue, since either the queue was … … 279 282 sent = 'sent_to_commit_queue' if queue == 'commit' else 'sent_to_buildbot' 280 283 previously_sent_patches = set(Patch.objects 281 .filter( modified__gte=from_timestamp)284 .filter(created__gte=from_timestamp) 282 285 .filter(**{sent: True}) 283 286 .filter(obsolete=False) 284 .filter( modified__lt=patch.modified))287 .filter(created__lt=patch.created)) 285 288 if parent_queue: 286 289 recent_builds_parent_queue = Build.objects \ 287 .filter( modified__gte=from_timestamp) \290 .filter(created__gte=from_timestamp) \ 288 291 .filter(builder_display_name=parent_queue) 289 292 processed_patches_parent_queue = set([build.patch for build in recent_builds_parent_queue]) … … 291 294 292 295 recent_builds = Build.objects \ 293 .filter( modified__gte=from_timestamp) \296 .filter(created__gte=from_timestamp) \ 294 297 .filter(builder_display_name=queue) 295 298 processed_patches = set([build.patch for build in recent_builds]) 299 _log.debug('Patch: {}, queue: {}, previous patches: {}'.format(patch.patch_id, queue, previously_sent_patches - processed_patches)) 296 300 return len(previously_sent_patches - processed_patches) + 1 297 301 -
trunk/Tools/ChangeLog
r258919 r258937 1 2020-03-24 Aakash Jain <aakash_jain@apple.com> 2 3 [ews] position in queue shown in status-bubble is larger than actual position 4 https://bugs.webkit.org/show_bug.cgi?id=209481 5 6 Reviewed by Jonathan Bedard. 7 8 * BuildSlaveSupport/ews-app/ews/views/statusbubble.py: 9 (StatusBubble._queue_position): Use created timestamp instead of modified. 10 1 11 2020-03-24 Daniel Bates <dabates@apple.com> 2 12
Note: See TracChangeset
for help on using the changeset viewer.