Changeset 71083 in webkit

Timestamp:

Nov 1, 2010 5:17:14 PM (14 years ago)

Author:

ojan@chromium.org

Message:

2010-11-01 Ojan Vafai <​ojan@chromium.org>

Reviewed by Dimitri Glazkov.

remove debug code from run_webkit_tests.py
​https://bugs.webkit.org/show_bug.cgi?id=48800

Remove temporary debug code and make --master-name required
if --test-results-server is set now that all clients set
--master-name.

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-11-01  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        remove debug code from run_webkit_tests.py
+        https://bugs.webkit.org/show_bug.cgi?id=48800
+
+        Remove temporary debug code and make --master-name required
+        if --test-results-server is set now that all clients set
+        --master-name.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-11-01  Tony Chang  <tony@chromium.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -949 +949 @@
             return
 
+        if not self._options.master_name:
+            _log.error("--test-results-server was set, but --master-name was not. Not uploading JSON files.")
+            return
+
         _log.info("Uploading JSON files for builder: %s",
                    self._options.builder_name)
 
-        attrs = [("builder", self._options.builder_name), ("testtype", "layout-tests")]
-        # FIXME: master_name should be required if test_results_server is set.
-        # Throw an error if master_name isn't set.
-        if self._options.master_name:
-            attrs.append(("master", self._options.master_name))
+        attrs = [("builder", self._options.builder_name), ("testtype", "layout-tests"),
+            ("master", self._options.master_name)]
 
         json_files = ["expectations.json"]
@@ -966 +967 @@
         files = [(file, os.path.join(self._options.results_directory, file))
             for file in json_files]
-
-        # FIXME: Remove this. This is temporary debug logging.
-        if self._options.builder_name.startswith("Webkit Linux"):
-            for filename in files:
-                _log.debug(filename[1])
-                with codecs.open(filename[1], "r") as results_file:
-                    _log.debug("%s:\n%s" % (filename[0], results_file.read()))
 
         uploader = test_results_uploader.TestResultsUploader(