Changeset 90472 in webkit

Timestamp:

Jul 6, 2011 11:13:59 AM (13 years ago)

Author:

eric@webkit.org

Message:

2011-07-06 Eric Seidel <​eric@webkit.org>

webkit-patch failure-reason does not understand NRWT results
​https://bugs.webkit.org/show_bug.cgi?id=64006

Reviewed by Adam Barth.

Adam Barth tells me failure-reason should be deleted soon,
but aroben's fancy new TestFailures/ page doesn't work for
NRWT yet, and I needed to know when
third-party-cookie-relaxing started failing.

• Scripts/webkitpy/common/net/buildbot/buildbot.py:
• Scripts/webkitpy/tool/commands/queries.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/buildbot/buildbot.py (modified) (3 diffs)
• Scripts/webkitpy/tool/commands/queries.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-06  Eric Seidel  <eric@webkit.org>
+
+        webkit-patch failure-reason does not understand NRWT results
+        https://bugs.webkit.org/show_bug.cgi?id=64006
+
+        Reviewed by Adam Barth.
+
+        Adam Barth tells me failure-reason should be deleted soon,
+        but aroben's fancy new TestFailures/ page doesn't work for
+        NRWT yet, and I needed to know when
+        third-party-cookie-relaxing started failing.
+
+        * Scripts/webkitpy/common/net/buildbot/buildbot.py:
+        * Scripts/webkitpy/tool/commands/queries.py:
+
 2011-07-06  Xan Lopez  <xlopez@igalia.com>
 

trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py

@@ -42 +42 @@
 from webkitpy.common.net.failuremap import FailureMap
 from webkitpy.common.net.layouttestresults import LayoutTestResults
+from webkitpy.common.net.networktransaction import NetworkTransaction
 from webkitpy.common.net.regressionwindow import RegressionWindow
 from webkitpy.common.net.testoutputset import TestOutputSet
@@ -47 +48 @@
 from webkitpy.common.system.zipfileset import ZipFileSet
 from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup
+
 
 _log = get_logger(__file__)
@@ -240 +242 @@
         return TestOutputSet(self._builder.name(), None, ZipFileSet(self.results_zip_url()), include_expected=False)
 
-    def _fetch_results_html(self):
-        results_html = "%s/results.html" % (self.results_url())
-        # FIXME: This should use NetworkTransaction's 404 handling or at least move
-        # to mechanize's to be more consistent with the rest of our code.
-        try:
-            # It seems this can return None if the url redirects and then returns 404.
-            result = urllib2.urlopen(results_html)
-            if not result:
-                return None
-            # urlopen returns a file-like object which sometimes works fine with str()
-            # but sometimes is a addinfourl object.  In either case calling read() is correct.
-            return result.read()
-        except urllib2.HTTPError, error:
-            if error.code != 404:
-                raise
+    def _fetch_file_from_results(self, file_name):
+        # It seems this can return None if the url redirects and then returns 404.
+        result = urllib2.urlopen("%s/%s" % (self.results_url(), file_name))
+        if not result:
+            return None
+        # urlopen returns a file-like object which sometimes works fine with str()
+        # but sometimes is a addinfourl object.  In either case calling read() is correct.
+        return result.read()
 
     def layout_test_results(self):
-        if not self._layout_test_results:
-            # FIXME: This should cache that the result was a 404 and stop hitting the network.
-            self._layout_test_results = LayoutTestResults.results_from_string(self._fetch_results_html())
+        if self._layout_test_results:
+            return self._layout_test_results
+
+        # FIXME: This should cache that the result was a 404 and stop hitting the network.
+        results_file = NetworkTransaction(convert_404_to_None=True).run(lambda: self._fetch_file_from_results("full_results.json"))
+        if not results_file:
+            results_file = NetworkTransaction(convert_404_to_None=True).run(lambda: self._fetch_file_from_results("results.html"))
+
+        # results_from_string accepts either ORWT html or NRWT json.
+        self._layout_test_results = LayoutTestResults.results_from_string(results_file)
         return self._layout_test_results
 

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

@@ -229 +229 @@
         if not layout_test_results:
             # FIXME: This could be made more user friendly.
-            print "Failed to load layout test results; can't continue. (start revision = r%s)" % start_revision
+            print "Failed to load layout test results from %s; can't continue. (start revision = r%s)" % (build.results_url(), start_revision)
             return 1