Changeset 75583 in webkit

Timestamp:

Jan 11, 2011 7:20:46 PM (13 years ago)

Author:

eric@webkit.org

Message:

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

Unreviewed.

commit-queue should know how to upload archived results (for test flakes or general failures)
​https://bugs.webkit.org/show_bug.cgi?id=52048

The zips are mostly empty due to forgetting -r.
Expected diffs were not being pulled from the archive due
to the archive having longer paths than I realized.

• Scripts/webkitpy/common/system/workspace.py:
• Scripts/webkitpy/common/system/workspace_unittest.py:
• Scripts/webkitpy/tool/bot/flakytestreporter.py:
• Scripts/webkitpy/tool/bot/flakytestreporter_unittest.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/flakytestreporter.py (modified) (2 diffs)
• Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-11  Eric Seidel  <eric@webkit.org>
+
+        Unreviewed.
+
+        commit-queue should know how to upload archived results (for test flakes or general failures)
+        https://bugs.webkit.org/show_bug.cgi?id=52048
+
+        The zips are mostly empty due to forgetting -r.
+        Expected diffs were not being pulled from the archive due
+        to the archive having longer paths than I realized.
+
+        * Scripts/webkitpy/common/system/workspace.py:
+        * Scripts/webkitpy/common/system/workspace_unittest.py:
+        * Scripts/webkitpy/tool/bot/flakytestreporter.py:
+        * Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
+
 2011-01-11  Dirk Pranke  <dpranke@chromium.org>
 

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

@@ -58 +58 @@
         # 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', zip_path, source_path])
+        self._executive.run_command(['zip', '-r', zip_path, source_path])
         return zip_class(zip_path)

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

@@ -48 +48 @@
     def test_create_zip(self):
         workspace = Workspace(None, MockExecutive(should_log=True))
-        expected_stderr = "MOCK run_command: ['zip', '/zip/path', '/source/path']\n"
+        expected_stderr = "MOCK run_command: ['zip', '-r', '/zip/path', '/source/path']\n"
         class MockZipFile(object):
             def __init__(self, path):

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

@@ -151 +151 @@
             self._tool.bugs.post_comment_to_bug(bug.id(), latest_flake_message)
 
+    # This method is needed because our archive paths include a leading tmp/layout-test-results
+    def _find_in_archive(self, path, archive):
+        for archived_path in archive.namelist():
+            # Archives are currently created with full paths.
+            if archived_path.endswith(path):
+                return archived_path
+        return None
+
     def _attach_failure_diff(self, flake_bug_id, flaky_test, results_archive):
         results_diff_path = self._results_diff_path_for_test(flaky_test)
@@ -157 +165 @@
         # there is a chance it's wrong.
         bot_id = self._tool.status_server.bot_id or "bot"
-        if results_diff_path in results_archive.namelist():
-            results_diff = results_archive.read(results_diff_path)
+        archive_path = self._find_in_archive(results_diff_path, results_archive)
+        if archive_path:
+            results_diff = results_archive.read(archive_path)
             description = "Failure diff from %s" % bot_id
             self._tool.bugs.add_attachment_to_bug(flake_bug_id, results_diff, description, filename="failure.diff")

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

@@ -162 +162 @@
         self.assertEqual(reporter._results_diff_path_for_test("test.html"), "test-diffs.txt")
 
-    # report_flaky_tests is also tested by queues_unittest
+    def test_find_in_archive(self):
+        reporter = FlakyTestReporter(MockTool(), 'dummy-queue')
+
+        class MockZipFile(object):
+            def namelist(self):
+                return ["tmp/layout-test-results/foo/bar-diffs.txt"]
+
+        reporter._find_in_archive("foo/bar-diffs.txt", MockZipFile())
+        # This is not ideal, but its
+        reporter._find_in_archive("txt", MockZipFile())