Changeset 91028 in webkit

Timestamp:

Jul 14, 2011 2:21:24 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

Unreviewed. Just fixing my test-webkitpy regression.

Fix the unit tests. Unfortunately scm does not use a filesystem
object so we can't control the result of detect_scm_system.
When detect_scm_system would fail, we would log, which would
cause all passing_run integration tests to fail.

• Scripts/webkitpy/common/checkout/scm/scm.py:
• Scripts/webkitpy/layout_tests/controllers/manager.py:
• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/test.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/scm.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/test.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.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
+
+        Unreviewed.  Just fixing my test-webkitpy regression.
+
+        Fix the unit tests.  Unfortunately scm does not use a filesystem
+        object so we can't control the result of detect_scm_system.
+        When detect_scm_system would fail, we would log, which would
+        cause all passing_run integration tests to fail.
+
+        * Scripts/webkitpy/common/checkout/scm/scm.py:
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/test.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+
 2011-07-14  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py

@@ -94 +94 @@
             return
         if not force_clean:
-            # FIXME: Shouldn't this use cwd=self.checkout_root?  (Git definitely would want that, unclear if SVN would.)
-            print self.run(self.status_command(), error_handler=Executive.ignore_error)
+            print self.run(self.status_command(), error_handler=Executive.ignore_error, cwd=self.checkout_root)
             raise ScriptError(message="Working directory has modifications, pass --force-clean or --no-clean to continue.")
         log("Cleaning working directory")

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

@@ -210 +210 @@
     results['has_pretty_patch'] = port_obj.pretty_patch_available()
     try:
-        results['revision'] = port_object.webkit_scm().head_svn_revision()
+        results['revision'] = port_obj.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))
+        # FIXME: We would like to warn here, but that would cause all passing_run integration tests
+        # to fail, since they assert that we have no logging output.
+        # The revision lookup always fails when running the tests since it tries to read from
+        # "/mock" using the real file system (since there is no way to mock out detect_scm_system at current).
+        # Once we fix detect_scm_system to use the mock file system we can add this log back.
+        #_log.warn("Failed to determine svn revision for checkout (cwd: %s, webkit_base: %s), leaving 'revision' key blank in full_results.json.\n%s" % (port_obj._filesystem.getcwd(), port_obj.path_from_webkit_base(), e))
         # Handle cases where we're running outside of version control.
         results['revision'] = ""

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

@@ -38 +38 @@
 import os
 
+from webkitpy.common.checkout.scm import detect_scm_system
 from webkitpy.common.memoized import memoized
 from webkitpy.common.net.testoutputset import AggregateTestOutputSet
@@ -608 +609 @@
         # 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())
+        return detect_scm_system(self._config.webkit_base_dir())
 
     def path_to_test_expectations_file(self):

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

@@ -242 +242 @@
     files[LAYOUT_TEST_DIR + 'userscripts/resources/iframe.html'] = 'iframe'
 
-    fs = filesystem_mock.MockFileSystem(files)
+    fs = filesystem_mock.MockFileSystem(files, dirs=set(['/mock']))  # Make sure at least the checkout_root exists as a directory.
     fs._tests = test_list
     return fs

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py

@@ -68 +68 @@
 
 
-def parse_args(extra_args=None, record_results=False, tests_included=False,
-               new_results=False, print_nothing=True):
+def parse_args(extra_args=None, record_results=False, tests_included=False, new_results=False, print_nothing=True):
     extra_args = extra_args or []
     if print_nothing:
@@ -94 +93 @@
 
 
-def passing_run(extra_args=None, port_obj=None, record_results=False,
-                tests_included=False, filesystem=None):
-    options, parsed_args = parse_args(extra_args, record_results,
-                                      tests_included)
+def passing_run(extra_args=None, port_obj=None, record_results=False, tests_included=False, filesystem=None):
+    options, parsed_args = parse_args(extra_args, record_results, tests_included)
     if not port_obj:
-        port_obj = port.get(port_name=options.platform, options=options,
-                            user=mocktool.MockUser(), filesystem=filesystem)
+        port_obj = port.get(port_name=options.platform, options=options, user=mocktool.MockUser(), filesystem=filesystem)
     buildbot_output = array_stream.ArrayStream()
     regular_output = array_stream.ArrayStream()
-    res = run_webkit_tests.run(port_obj, options, parsed_args, buildbot_output=buildbot_output,
-                               regular_output=regular_output)
+    res = run_webkit_tests.run(port_obj, options, parsed_args, buildbot_output=buildbot_output, regular_output=regular_output)
     return res == 0 and regular_output.empty() and buildbot_output.empty()
 
@@ -115 +110 @@
     user = mocktool.MockUser()
     if not port_obj:
-        port_obj = port.get(port_name=options.platform, options=options,
-                            user=user, filesystem=filesystem)
-
-    res, buildbot_output, regular_output = run_and_capture(port_obj, options,
-                                                           parsed_args)
+        port_obj = port.get(port_name=options.platform, options=options, user=user, filesystem=filesystem)
+
+    res, buildbot_output, regular_output = run_and_capture(port_obj, options, parsed_args)
     return (res, buildbot_output, regular_output, user)