Changeset 76071 in webkit

Timestamp:

Jan 18, 2011 2:59:09 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-01-18 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

commit-queue dies when test archiving fails
​https://bugs.webkit.org/show_bug.cgi?id=52617

I looked at the machine and it had 10 archives already
thus find_unused_name was returning None. I've upped
the limit to 100 (per bug) and tested the case where
find_unused_name returns None (making archive return None).

• Scripts/webkitpy/common/system/workspace.py:
• Scripts/webkitpy/common/system/workspace_unittest.py:
• Scripts/webkitpy/tool/bot/commitqueuetask.py:
• Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
• Scripts/webkitpy/tool/commands/queues.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/workspace.py (modified) (1 diff)
• Scripts/webkitpy/common/system/workspace_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/bot/commitqueuetask.py (modified) (1 diff)
• Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/queues.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-18  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        commit-queue dies when test archiving fails
+        https://bugs.webkit.org/show_bug.cgi?id=52617
+
+        I looked at the machine and it had 10 archives already
+        thus find_unused_name was returning None.  I've upped
+        the limit to 100 (per bug) and tested the case where
+        find_unused_name returns None (making archive return None).
+
+        * Scripts/webkitpy/common/system/workspace.py:
+        * Scripts/webkitpy/common/system/workspace_unittest.py:
+        * Scripts/webkitpy/tool/bot/commitqueuetask.py:
+        * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
+        * Scripts/webkitpy/tool/commands/queues.py:
+
 2011-01-18  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/common/system/workspace.py

@@ -37 +37 @@
         self._executive = executive  # FIXME: Remove if create_zip is moved to python.
 
-    def find_unused_filename(self, directory, name, extension, search_limit=10):
+    def find_unused_filename(self, directory, name, extension, search_limit=100):
         for count in range(search_limit):
             if count:

trunk/Tools/Scripts/webkitpy/common/system/workspace_unittest.py

@@ -41 +41 @@
             "dir/foo.jpg": "",
             "dir/foo-1.jpg": "",
+            "dir/foo-2.jpg": "",
         })
         workspace = Workspace(filesystem, None)
         self.assertEqual(workspace.find_unused_filename("bar", "bar", "bar"), "bar/bar.bar")
-        self.assertEqual(workspace.find_unused_filename("dir", "foo", "jpg"), "dir/foo-2.jpg")
+        self.assertEqual(workspace.find_unused_filename("dir", "foo", "jpg", search_limit=1), None)
+        self.assertEqual(workspace.find_unused_filename("dir", "foo", "jpg", search_limit=2), None)
+        self.assertEqual(workspace.find_unused_filename("dir", "foo", "jpg"), "dir/foo-3.jpg")
 
     def test_create_zip(self):

trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py

@@ -188 +188 @@
         first_results_archive = self._delegate.archive_last_layout_test_results(self._patch)
         if self._test():
-            self._report_flaky_tests(first_results, first_results_archive)
+            # Only report flaky tests if we were successful at archiving results.
+            if first_results_archive:
+                self._report_flaky_tests(first_results, first_results_archive)
             return True
 

trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

@@ -210 +210 @@
         self._run_through_task(commit_queue, expected_stderr)
 
+    def test_failed_archive(self):
+        commit_queue = MockCommitQueue([
+            None,
+            None,
+            None,
+            None,
+            ScriptError("MOCK tests failure"),
+        ])
+        # It's possible delegate to fail to archive layout tests, don't try to report
+        # flaky tests when that happens.
+        commit_queue.archive_last_layout_test_results = lambda patch: None
+        expected_stderr = """run_webkit_patch: ['clean']
+command_passed: success_message='Cleaned working directory' patch='197'
+run_webkit_patch: ['update']
+command_passed: success_message='Updated working directory' patch='197'
+run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
+command_passed: success_message='Applied patch' patch='197'
+run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
+command_passed: success_message='Built patch' patch='197'
+run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
+command_failed: failure_message='Patch does not pass tests' script_error='MOCK tests failure' patch='197'
+run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
+command_passed: success_message='Passed tests' patch='197'
+run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197]
+command_passed: success_message='Landed patch' patch='197'
+"""
+        self._run_through_task(commit_queue, expected_stderr)
+
     _double_flaky_test_counter = 0
 

trunk/Tools/Scripts/webkitpy/tool/commands/queues.py

@@ -324 +324 @@
         # Note: We name the zip with the bug_id instead of patch_id to match work_item_log_path().
         zip_path = self._tool.workspace.find_unused_filename(self._log_directory(), "%s-%s" % (patch.bug_id(), results_name), "zip")
+        if not zip_path:
+            return None
         archive = self._tool.workspace.create_zip(zip_path, results_directory)
         # Remove the results directory to prevent http logs, etc. from getting huge between runs.