Changeset 70254 in webkit


Ignore:
Timestamp:
Oct 21, 2010 12:19:38 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-10-21 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

mac-ews is not properly releasing patches
​https://bugs.webkit.org/show_bug.cgi?id=48076

mac-ews overrides process_work_item, so it was not calling
release_work_item like the default process_work_item would.
To fix this I made all the status-reporting methods just
release the patch. I expect we'll iterate on this design further.

  • Scripts/webkitpy/common/net/statusserver.py:
  • Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
  • Scripts/webkitpy/tool/commands/queues.py:
  • Scripts/webkitpy/tool/commands/queues_unittest.py:
Location:
trunk/WebKitTools
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r70253 r70254  
     12010-10-21  Eric Seidel  <eric@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        mac-ews is not properly releasing patches
     6        https://bugs.webkit.org/show_bug.cgi?id=48076
     7
     8        mac-ews overrides process_work_item, so it was not calling
     9        release_work_item like the default process_work_item would.
     10        To fix this I made all the status-reporting methods just
     11        release the patch.  I expect we'll iterate on this design further.
     12
     13        * Scripts/webkitpy/common/net/statusserver.py:
     14        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
     15        * Scripts/webkitpy/tool/commands/queues.py:
     16        * Scripts/webkitpy/tool/commands/queues_unittest.py:
     17
    1182010-10-18  Martin Robinson  <mrobinson@igalia.com>
    219

  • trunk/WebKitTools/Scripts/webkitpy/common/net/statusserver.py

    r70193 r70254  
    128128
    129129    def release_work_item(self, queue_name, patch):
    130         _log.debug("Releasing work item %s from %s" % (patch.id(), queue_name))
     130        _log.info("Releasing work item %s from %s" % (patch.id(), queue_name))
    131131        return NetworkTransaction(convert_404_to_None=True).run(lambda: self._post_release_work_item(queue_name, patch))
    132132

  • trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py

    r70171 r70254  
    8181        ews = MacEWS()
    8282        expected_stderr = self._default_expected_stderr(ews)
    83         expected_stderr["process_work_item"] = "MOCK: update_status: mac-ews Error: mac-ews cannot process patches from non-committers :(\n"
     83        expected_stderr["process_work_item"] = "MOCK: update_status: mac-ews Error: mac-ews cannot process patches from non-committers :(\nMOCK: release_work_item: mac-ews 197\n"
    8484        expected_exceptions = {
    8585            "handle_script_error": SystemExit,
    … …  
    9090        ews = ChromiumMacEWS()
    9191        expected_stderr = self._default_expected_stderr(ews)
    92         expected_stderr["process_work_item"] = "MOCK: update_status: cr-mac-ews Error: cr-mac-ews cannot process patches from non-committers :(\n"
     92        expected_stderr["process_work_item"] = "MOCK: update_status: cr-mac-ews Error: cr-mac-ews cannot process patches from non-committers :(\nMOCK: release_work_item: cr-mac-ews 197\n"
    9393        expected_exceptions = {
    9494            "handle_script_error": SystemExit,

  • trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues.py

    r70228 r70254  
    205205    def _did_pass(self, patch):
    206206        self._update_status(self._pass_status, patch)
     207        self._release_work_item(patch)
    207208
    208209    def _did_fail(self, patch):
    209210        self._update_status(self._fail_status, patch)
     211        self._release_work_item(patch)
    210212
    211213    def _did_retry(self, patch):
    212214        self._update_status(self._retry_status, patch)
     215        self._release_work_item(patch)
    213216
    214217    def _did_error(self, patch, reason):
    215218        message = "%s: %s" % (self._error_status, reason)
    216219        self._update_status(message, patch)
     220        self._release_work_item(patch)
    217221
    218222    def work_item_log_path(self, patch):
    … …  
    252256            validator.reject_patch_from_commit_queue(patch.id(), self._error_message_for_bug(task.failure_status_id, e))
    253257            self._did_fail(patch)
    254         self._release_work_item(patch)
    255258
    256259    def _error_message_for_bug(self, status_id, script_error):
    … …  
    406409                self._did_fail(patch)
    407410            raise e
    408         finally:
    409             self._release_work_item(patch)
    410411
    411412    def handle_unexpected_error(self, patch, message):

  • trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py

    r70228 r70254  
    210210MOCK: update_status: commit-queue Landed patch
    211211MOCK: update_status: commit-queue Pass
     212MOCK: release_work_item: commit-queue 197
    212213""",
    213214            "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '197' with comment 'Rejecting patch 197 from commit-queue.' and additional comment 'Mock error message'\n",
    … …  
    253254MOCK: update_status: commit-queue Landed patch
    254255MOCK: update_status: commit-queue Pass
     256MOCK: release_work_item: commit-queue 197
    255257""",
    256258            "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '197' with comment 'Rejecting patch 197 from commit-queue.' and additional comment 'Mock error message'\n",
    … …  
    276278MOCK: update_status: commit-queue Landed patch
    277279MOCK: update_status: commit-queue Pass
     280MOCK: release_work_item: commit-queue 197
    278281""",
    279282            "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '197' with comment 'Rejecting patch 197 from commit-queue.' and additional comment 'Mock error message'\n",
    … …  
    339342            "begin_work_queue": self._default_begin_work_queue_stderr("rietveld-upload-queue", MockSCM.fake_checkout_root),
    340343            "should_proceed_with_work_item": "MOCK: update_status: rietveld-upload-queue Uploading patch\n",
    341             "process_work_item": "MOCK: update_status: rietveld-upload-queue Pass\n",
     344            "process_work_item": "MOCK: update_status: rietveld-upload-queue Pass\nMOCK: release_work_item: rietveld-upload-queue 197\n",
    342345            "handle_unexpected_error": "Mock error message\nMOCK setting flag 'in-rietveld' to '-' on attachment '197' with comment 'None' and additional comment 'None'\n",
    343346            "handle_script_error": "ScriptError error message\nMOCK: update_status: rietveld-upload-queue ScriptError error message\nMOCK setting flag 'in-rietveld' to '-' on attachment '197' with comment 'None' and additional comment 'None'\n",
Note: See TracChangeset for help on using the changeset viewer.