Changeset 84333 in webkit

Timestamp:

Apr 19, 2011 8:17:20 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-04-19 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

The commit-queue is confused when non-layout tests fail
​https://bugs.webkit.org/show_bug.cgi?id=58955

As seen in ​http://queues.webkit.org/results/8474435

It fails to create an archive of the layout test results
and then throws an exception.

I've fixed this by making it catch the exception as well
as made it so it never calls that path in the common case.

I've updated MockFileSystem to understand rmtree's affect on
directories as well as files.

• Scripts/webkitpy/common/system/filesystem_mock.py:
• Scripts/webkitpy/common/system/workspace.py:
• Scripts/webkitpy/tool/commands/queues.py:
• Scripts/webkitpy/tool/commands/queues_unittest.py:
• Scripts/webkitpy/tool/mocktool.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/filesystem_mock.py (modified) (2 diffs)
• Scripts/webkitpy/common/system/workspace.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/queues.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/queues_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/mocktool.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-19  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        The commit-queue is confused when non-layout tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=58955
+
+        As seen in http://queues.webkit.org/results/8474435
+
+        It fails to create an archive of the layout test results
+        and then throws an exception.
+
+        I've fixed this by making it catch the exception as well
+        as made it so it never calls that path in the common case.
+
+        I've updated MockFileSystem to understand rmtree's affect on
+        directories as well as files.
+
+        * Scripts/webkitpy/common/system/filesystem_mock.py:
+        * Scripts/webkitpy/common/system/workspace.py:
+        * Scripts/webkitpy/tool/commands/queues.py:
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+
 2011-04-19  Ojan Vafai  <ojan@chromium.org>
 

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

@@ -148 +148 @@
         path = self.normpath(path)
         if path in self.dirs:
-            return True
+            return self.dirs[path] is not None
 
         # We need to use a copy of the keys here in order to avoid switching
@@ -268 +268 @@
 
     def rmtree(self, path):
-        if not path.endswith(self.sep):
-            path += self.sep
+        path = self.normpath(path)
 
         for f in self.files:
             if f.startswith(path):
                 self.files[f] = None
+
+        for d in self.dirs:
+            if d.startswith(path):
+                self.dirs[d] = None
 
     def splitext(self, path):

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

@@ -30 +30 @@
 # below more complicated objects.
 
+import logging
 import zipfile
+
+
+_log = logging.getLogger(__name__)
+
 
 class Workspace(object):
@@ -58 +63 @@
         # However, getting the paths, encoding and compression correct could be non-trivial.
         # So, for now we depend on the environment having "zip" installed (likely fails on Win32)
-        self._executive.run_command(['zip', '-r', zip_path, source_path])
+        try:
+            self._executive.run_command(['zip', '-r', zip_path, source_path])
+        except ScriptError, e:
+            _log.error("Workspace.create_zip failed:\n%s" % e.message_with_output())
+            return None
+
         return zip_class(zip_path)

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

@@ -354 +354 @@
         if not zip_path:
             return None
+        if not self._tool.filesystem.isdir(results_directory):
+            log("%s does not exist, not archiving." % results_directory)
+            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.

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

@@ -404 +404 @@
     def test_archive_last_layout_test_results(self):
         queue = CommitQueue()
-        queue.bind_to_tool(MockTool())
+        tool = MockTool()
+        queue.bind_to_tool(tool)
         patch = queue._tool.bugs.fetch_attachment(128)
-        # This is just to test that the method doesn't raise.
-        queue.archive_last_layout_test_results(patch)
+        # Should fail because the results_directory does not exist.
+        expected_stderr = "/mock does not exist, not archiving.\n"
+        archive = OutputCapture().assert_outputs(self, queue.archive_last_layout_test_results, [patch], expected_stderr=expected_stderr)
+        self.assertEqual(archive, None)
+
+        results_directory = "/mock"
+        # Sanity check what we assume our mock results directory is.
+        self.assertEqual(queue._results_directory(), results_directory)
+        tool.filesystem.maybe_make_directory(results_directory)
+        self.assertTrue(tool.filesystem.exists(results_directory))
+
+        self.assertNotEqual(queue.archive_last_layout_test_results(patch), None)
+        self.assertFalse(tool.filesystem.exists(results_directory))
 
     def test_upload_results_archive_for_patch(self):

trunk/Tools/Scripts/webkitpy/tool/mocktool.py

@@ -729 +729 @@
 
     def create_zip(self, zip_path, source_path):
-        pass
+        return object()  # Something that is not None