Changeset 83906 in webkit

Timestamp:

Apr 14, 2011 3:55:46 PM (13 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Adam Barth.

commit-queue fails to catch IOError when results.html is missing
​https://bugs.webkit.org/show_bug.cgi?id=58589

• Scripts/webkitpy/tool/commands/queues.py:
• Scripts/webkitpy/tool/commands/queues_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/queues.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/queues_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-14  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        commit-queue fails to catch IOError when results.html is missing
+        https://bugs.webkit.org/show_bug.cgi?id=58589
+
+        * Scripts/webkitpy/tool/commands/queues.py:
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
 2011-04-14  Kevin Ollivier  <kevino@theolliviers.com>
 

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

@@ -317 +317 @@
         try:
             return self._tool.filesystem.read_text_file(path)
-        except OSError, e:  # File does not exist or can't be read.
+        except IOError, e:  # File does not exist or can't be read.
             return None
 

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

@@ -379 +379 @@
         OutputCapture().assert_outputs(self, queue.report_flaky_tests, [QueuesTest.mock_work_item, test_results, MockZipFile()], expected_stderr=expected_stderr)
 
+    def test_missing_layout_test_results(self):
+        queue = CommitQueue()
+        tool = MockTool()
+        results_path = '/mock/results.html'
+        tool.filesystem = MockFileSystem({results_path: None})
+        queue.bind_to_tool(tool)
+        # Make sure that our filesystem mock functions as we expect.
+        self.assertRaises(IOError, tool.filesystem.read_text_file, results_path)
+        # layout_test_results shouldn't raise even if the results.html file is missing.
+        self.assertEquals(queue.layout_test_results(), None)
+
     def test_layout_test_results(self):
         queue = CommitQueue()