WebKit Bugzilla
Attachment 342902 Details for
Bug 186748
: QueueStatusServer: "'NoneType' object has no attribute 'message'" in ReleasePatch.get() when attachment is skipped by queue
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-186748-20180616182929.patch (text/plain), 3.69 KB, created by
Daniel Bates
on 2018-06-16 18:29:30 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Daniel Bates
Created:
2018-06-16 18:29:30 PDT
Size:
3.69 KB
patch
obsolete
>Subversion Revision: 232910 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 8eb5a2b5864617045972bab24772dd15ad60fb46..51781e50e796a5d6bb62e342eeb3066a0b866359 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,29 @@ >+2018-06-16 Daniel Bates <dabates@apple.com> >+ >+ QueueStatusServer: "'NoneType' object has no attribute 'message'" in ReleasePatch.get() >+ when attachment is skipped by queue >+ https://bugs.webkit.org/show_bug.cgi?id=186748 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Fixes an issue where releasing a patch that was skipped by a queue (e.g. an attachment on >+ a security bug) would cause an AttributeError in ReleasePatch.get(). >+ >+ When removing a patch from a queue we update queue statistics. As part of this process >+ we record the last message posted to the status server for the patch. Currently if a patch >+ is skipped by the queue when picking the next patch to process (say, the patch is on a >+ security bug and the queue does not have access to view it) then the queue does not post >+ a message to the status server before it asks the status server to remove the patch from >+ the list of patches the queue needs to process. Instead the queue should tell the status >+ server that it chose to skip the patch before asking for the patch to be removed from its >+ list of patches to process. >+ >+ * Scripts/webkitpy/tool/commands/queues.py: >+ (AbstractPatchQueue._next_patch): Call AbstractPatchQueue._did_skip() to post a status >+ update to the status server and then release the work item. >+ * Scripts/webkitpy/tool/commands/queues_unittest.py: >+ (AbstractPatchQueueTest.test_next_patch): Update expected result. >+ > 2018-06-16 Leo Balter <leonardo.balter@gmail.com> > > [test262-runner] Handle items from the config list with inline comments >diff --git a/Tools/Scripts/webkitpy/tool/commands/queues.py b/Tools/Scripts/webkitpy/tool/commands/queues.py >index 77c2d8827bcc010df684800e6d46d3651b018f87..a8d7a16c557523af7087bdf7625b0260eb719397 100644 >--- a/Tools/Scripts/webkitpy/tool/commands/queues.py >+++ b/Tools/Scripts/webkitpy/tool/commands/queues.py >@@ -224,7 +224,7 @@ class AbstractPatchQueue(AbstractQueue): > # mostly we just need to remove this bogus patch from our queue. > # If for some reason bugzilla is just down, then it will be re-fed later. > fake_patch = Attachment({'id': patch_id}, None) >- self._release_work_item(fake_patch) >+ self._did_skip(fake_patch) > return patch > > def _release_work_item(self, patch): >diff --git a/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py b/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py >index 6d722e8b9a5007da8e2d6c88ea8734b9b6a42467..699621e1152716becfdc830a22fc73e9e7954b0e 100644 >--- a/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py >+++ b/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py >@@ -161,7 +161,9 @@ class AbstractPatchQueueTest(CommandsTest): > self.assertIsNone(queue._next_patch()) > tool.status_server = MockStatusServer(work_items=[2, 10000, 10001]) > expected_stdout = "MOCK: fetch_attachment: 2 is not a known attachment id\n" # A mock-only message to prevent us from making mistakes. >- expected_logs = "MOCK: release_work_item: None 2\n" >+ expected_logs = """MOCK: update_status: None Skip >+MOCK: release_work_item: None 2 >+""" > patch = OutputCapture().assert_outputs(self, queue._next_patch, expected_stdout=expected_stdout, expected_logs=expected_logs) > # The patch.id() == 2 is ignored because it doesn't exist. > self.assertEqual(patch.id(), 10000)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 186748
:
342902
|
342905