Changeset 91023 in webkit

Timestamp:

Jul 14, 2011 12:32:00 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

NRWT doesn't store the svn revision in full_results.json on chromium-win
​https://bugs.webkit.org/show_bug.cgi?id=64492

Reviewed by Ojan Vafai.

This should fix the bug. Unfortunately this code is currently
impossible to test since it's impossible to mock detect_scm_system at the
moment. I started re-writing scm.detection.py to be mockable, but decided that
was best left for another day.

• Scripts/webkitpy/layout_tests/controllers/manager.py:
• Scripts/webkitpy/layout_tests/port/base.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-14  Eric Seidel  <eric@webkit.org>
+
+        NRWT doesn't store the svn revision in full_results.json on chromium-win
+        https://bugs.webkit.org/show_bug.cgi?id=64492
+
+        Reviewed by Ojan Vafai.
+
+        This should fix the bug.  Unfortunately this code is currently
+        impossible to test since it's impossible to mock detect_scm_system at the
+        moment.  I started re-writing scm.detection.py to be mockable, but decided that
+        was best left for another day.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+
 2011-07-14  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

@@ -210 +210 @@
     results['has_pretty_patch'] = port_obj.pretty_patch_available()
     try:
-        results['revision'] = scm.default_scm().head_svn_revision()
+        results['revision'] = port_object.webkit_scm().head_svn_revision()
     except Exception, e:
         _log.warn("Failed to determine svn revision for checkout (cwd: %s), leaving 'revision' key blank in full_results.json.\n%s" % (port_obj._filesystem.getcwd(), e))

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -38 +38 @@
 import os
 
+from webkitpy.common.memoized import memoized
 from webkitpy.common.net.testoutputset import AggregateTestOutputSet
+
 
 # Handle Python < 2.6 where multiprocessing isn't available.
@@ -60 +62 @@
 
 _log = logutils.get_logger(__file__)
+
 
 class DummyOptions(object):
@@ -598 +601 @@
         WebKit source tree and the list of path components in |*comps|."""
         return self._config.path_from_webkit_base(*comps)
+
+    @memoized
+    def webkit_scm(self):
+        # On the chromium bots, the cwd is the root of the chromium checkout.
+        # self._config.webkit_base_dir() knows where the webkit root is, no other
+        # object in NRWT seems to keep an SCM around.  (Unlike webkit-patch where it's on the Tool/Host object.)
+        # FIXME: We should be able to get the SCM from somewhere else.
+        return scm.detect_scm_system(self._config.webkit_base_dir())
 
     def path_to_test_expectations_file(self):