Changeset 83635 in webkit

Timestamp:

Apr 12, 2011 1:53:10 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-12 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Tony Chang.

new-run-webkit-tests: update code to use port.results_directory() instead of options.results_directory
​https://bugs.webkit.org/show_bug.cgi?id=58290

This is some preliminary refactoring for bug 58272.

• Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:
• Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py:
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
• Scripts/webkitpy/layout_tests/layout_package/worker_mixin.py:
• Scripts/webkitpy/layout_tests/port/test.py:
• Scripts/webkitpy/layout_tests/port/chromium.py:
• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py (modified) (9 diffs)
• Scripts/webkitpy/layout_tests/layout_package/worker_mixin.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/test.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ -28 +28 @@
         (TestWebKitAPI::PlatformWebView::simulateAKeyDown): Added.
         * TestWebKitAPI/win/TestWebKitAPI.vcproj: Added TranslateMessageGeneratesWMChar.cpp.
+
+2011-04-12  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        new-run-webkit-tests: update code to use port.results_directory() instead of options.results_directory
+        https://bugs.webkit.org/show_bug.cgi?id=58290
+
+        This is some preliminary refactoring for bug 58272.
+
+        * Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:
+        * Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py:
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
+        * Scripts/webkitpy/layout_tests/layout_package/worker_mixin.py:
+        * Scripts/webkitpy/layout_tests/port/test.py:
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
 
 2011-04-12  Dirk Pranke  <dpranke@chromium.org>

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py

@@ -124 +124 @@
         expected_driver_output = self._expected_driver_output()
         test_result = self._compare_output(driver_output, expected_driver_output)
-        test_result_writer.write_test_result(self._port, self._options.results_directory, self._filename,
+        test_result_writer.write_test_result(self._port, self._filename,
                                              driver_output, expected_driver_output, test_result.failures)
         return test_result
@@ -131 +131 @@
         driver_output = self._driver.run_test(self._driver_input())
         failures = self._handle_error(driver_output)
-        test_result_writer.write_test_result(self._port, self._options.results_directory, self._filename,
+        test_result_writer.write_test_result(self._port, self._filename,
                                              driver_output, None, failures)
         # FIXME: It the test crashed or timed out, it might be bettter to avoid
@@ -273 +273 @@
         test_result = self._compare_output_with_reference(driver_output1, driver_output2)
 
-        test_result_writer.write_test_result(self._port, self._options.results_directory, self._filename,
+        test_result_writer.write_test_result(self._port, self._filename,
                                              driver_output1, driver_output2, test_result.failures)
         return test_result

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py

@@ -37 +37 @@
 
 
-def write_test_result(port, root_output_dir, filename, driver_output,
+def write_test_result(port, filename, driver_output,
                       expected_driver_output, failures):
     """Write the test result to the result output directory."""
+    root_output_dir = port.results_directory()
     checksums_mismatch_but_images_are_same = False
     imagehash_mismatch_failure = None

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_runner.py

@@ -206 +206 @@
         self._result_queue = Queue.Queue()
         self._retrying = False
+        self._results_directory = self._port.results_directory()
 
     def collect_tests(self, args, last_unexpected_results):
@@ -356 +357 @@
                 tests_run_msg += "\n" + extra_msg
                 files.extend(test_files[0:extra])
-            tests_run_filename = self._fs.join(self._options.results_directory,
-                                              "tests_run.txt")
+            tests_run_filename = self._fs.join(self._results_directory, "tests_run.txt")
             self._fs.write_text_file(tests_run_filename, tests_run_msg)
 
@@ -630 +630 @@
 
         # Create the output directory if it doesn't already exist.
-        self._port.maybe_make_directory(self._options.results_directory)
+        self._port.maybe_make_directory(self._results_directory)
 
         self._port.setup_test_run()
@@ -774 +774 @@
         # tracking.
         self._printer.print_update("Clobbering old results in %s" %
-                                   self._options.results_directory)
+                                   self._results_directory)
         layout_tests_dir = self._port.layout_tests_dir()
         possible_dirs = self._port.test_dirs()
         for dirname in possible_dirs:
             if self._fs.isdir(self._fs.join(layout_tests_dir, dirname)):
-                self._fs.rmtree(self._fs.join(self._options.results_directory,
-                                              dirname))
+                self._fs.rmtree(self._fs.join(self._results_directory, dirname))
 
     def _get_failures(self, result_summary, include_crashes):
@@ -830 +829 @@
             dashboard).
         """
-        _log.debug("Writing JSON files in %s." % self._options.results_directory)
-
-        unexpected_json_path = self._fs.join(self._options.results_directory, "unexpected_results.json")
+        _log.debug("Writing JSON files in %s." % self._results_directory)
+
+        unexpected_json_path = self._fs.join(self._results_directory, "unexpected_results.json")
         json_results_generator.write_json(self._fs, unexpected_results, unexpected_json_path)
 
-        full_results_path = self._fs.join(self._options.results_directory, "full_results.json")
+        full_results_path = self._fs.join(self._results_directory, "full_results.json")
         json_results_generator.write_json(self._fs, summarized_results, full_results_path)
 
         # Write a json file of the test_expectations.txt file for the layout
         # tests dashboard.
-        expectations_path = self._fs.join(self._options.results_directory, "expectations.json")
+        expectations_path = self._fs.join(self._results_directory, "expectations.json")
         expectations_json = \
             self._expectations.get_expectations_json_for_all_platforms()
@@ -848 +847 @@
         generator = json_layout_results_generator.JSONLayoutResultsGenerator(
             self._port, self._options.builder_name, self._options.build_name,
-            self._options.build_number, self._options.results_directory,
+            self._options.build_number, self._results_directory,
             BUILDER_BASE_URL, individual_test_timings,
             self._expectations, result_summary, self._test_files_list,
@@ -866 +865 @@
         p.print_config("Using port '%s'" % self._port.name())
         p.print_config("Test configuration: %s" % self._port.test_configuration())
-        p.print_config("Placing test results in %s" %
-                       self._options.results_directory)
+        p.print_config("Placing test results in %s" % self._results_directory)
         if self._options.new_baseline:
             p.print_config("Placing new baselines in %s" %
@@ -1186 +1184 @@
             return False
 
-        out_filename = self._fs.join(self._options.results_directory,
-                                     "results.html")
+        out_filename = self._fs.join(self._results_directory, "results.html")
         with self._fs.open_text_file_for_writing(out_filename) as results_file:
             html = self._results_html(test_files, result_summary.failures, results_title)
@@ -1196 +1193 @@
     def _show_results_html_file(self):
         """Shows the results.html page."""
-        results_filename = self._fs.join(self._options.results_directory,
-                                         "results.html")
+        results_filename = self._fs.join(self._results_directory, "results.html")
         self._port.show_results_html_file(results_filename)
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker_mixin.py

@@ -56 +56 @@
         self._batch_size = self._options.batch_size
         self._driver = None
-        tests_run_filename = self._filesystem.join(self._options.results_directory,
+        tests_run_filename = self._filesystem.join(port.results_directory(),
                                                    "tests_run%d.txt" % self._worker_number)
         self._tests_run_file = self._filesystem.open_text_file_for_writing(tests_run_filename)

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

@@ -608 +608 @@
         if self.get_option('use_apache'):
             self._http_server = apache_http_server.LayoutTestApacheHttpd(self,
-                self.get_option('results_directory'))
+                self.results_directory())
         else:
-            self._http_server = http_server.Lighttpd(self,
-                self.get_option('results_directory'))
+            self._http_server = http_server.Lighttpd(self, self.results_directory())
         self._http_server.start()
 
@@ -618 +617 @@
         it isn't. This routine is allowed to (and may) fail if a server
         is already running."""
-        self._websocket_server = websocket_server.PyWebSocket(self,
-            self.get_option('results_directory'))
+        self._websocket_server = websocket_server.PyWebSocket(self, self.results_directory())
         self._websocket_server.start()
 

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

@@ -342 +342 @@
         self.KILL_TIMEOUT = 3.0
         if self._port.get_option('pixel_tests'):
-            self._image_path = self._port._filesystem.join(
-                self._port.get_option('results_directory'),
+            self._image_path = self._port._filesystem.join(self._port.results_directory(),
                 'png_result%s.png' % self._worker_number)
 

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

@@ -258 +258 @@
         base.Port.__init__(self, port_name=port_name, filesystem=filesystem, user=user,
                            **kwargs)
+        self._results_directory = None
 
         assert filesystem._tests
@@ -330 +331 @@
 
     def results_directory(self):
-        return '/tmp/' + self.get_option('results_directory')
+        if not self._results_directory:
+            self._results_directory = self._filesystem.join('/tmp',
+                self.get_option('results_directory'))
+        return self._results_directory
 
     def setup_test_run(self):

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

@@ -80 +80 @@
         return 0
 
-    last_unexpected_results = _gather_unexpected_results(port._filesystem, options)
+    last_unexpected_results = _gather_unexpected_results(port)
     if options.print_last_failures:
         printer.write("\n".join(last_unexpected_results) + "\n")
@@ -179 +179 @@
 
 
-def _gather_unexpected_results(filesystem, options):
+def _gather_unexpected_results(port):
     """Returns the unexpected results from the previous run, if any."""
+    filesystem = port._filesystem
+    results_directory = port.results_directory()
+    options = port._options
     last_unexpected_results = []
     if options.print_last_failures or options.retest_last_failures:
-        unexpected_results_filename = filesystem.join(options.results_directory, "unexpected_results.json")
+        unexpected_results_filename = filesystem.join(results_directory, "unexpected_results.json")
         if filesystem.exists(unexpected_results_filename):
             results = json_results_generator.load_json(filesystem, unexpected_results_filename)