new-run-webkit-tests shouldn't restore Safari state on Lion when showing results
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Feb 2012 23:23:44 +0000 (23:23 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Feb 2012 23:23:44 +0000 (23:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=79277

Reviewed by Adam Barth.

Pass command line argument no-saved-state to run-safari to disable Safari
state restoration for the session on OS 10.7.

* Scripts/webkitpy/layout_tests/port/mac.py:
(MacPort.show_results_html_file):
* Scripts/webkitpy/layout_tests/port/mac_unittest.py:
(test_show_results_html_file):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@108560 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/port/mac.py
Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py

index 5be48bf..01313a6 100644 (file)
@@ -1,3 +1,18 @@
+2012-02-22  Daniel Bates  <dbates@webkit.org>
+
+        new-run-webkit-tests shouldn't restore Safari state on Lion when showing results
+        https://bugs.webkit.org/show_bug.cgi?id=79277
+
+        Reviewed by Adam Barth.
+
+        Pass command line argument no-saved-state to run-safari to disable Safari
+        state restoration for the session on OS 10.7.
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+        (MacPort.show_results_html_file):
+        * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+        (test_show_results_html_file):
+
 2012-02-22  Kalev Lember  <kalevlember@gmail.com>
 
         Explicitly include unistd.h in TestNetscapePlugIn for GCC 4.7
index 202f2de..829b896 100644 (file)
@@ -128,7 +128,7 @@ class MacPort(ApplePort):
         return self._build_path('WebCore.framework/Versions/A/WebCore')
 
     def show_results_html_file(self, results_filename):
-        self._run_script('run-safari', ['-NSOpen', results_filename])
+        self._run_script('run-safari', ['--no-saved-state', '-NSOpen', results_filename])
 
     # FIXME: The next two routines turn off the http locking in order
     # to work around failures on the bots caused when the slave restarts.
index bdef980..35e64e4 100644 (file)
@@ -161,7 +161,7 @@ java/
         port = self.make_port()
         # Delay setting a should_log executive to avoid logging from MacPort.__init__.
         port._executive = MockExecutive(should_log=True)
-        expected_stderr = "MOCK run_command: ['Tools/Scripts/run-safari', '--release', '-NSOpen', 'test.html'], cwd=/mock-checkout\n"
+        expected_stderr = "MOCK run_command: ['Tools/Scripts/run-safari', '--release', '--no-saved-state', '-NSOpen', 'test.html'], cwd=/mock-checkout\n"
         OutputCapture().assert_outputs(self, port.show_results_html_file, ["test.html"], expected_stderr=expected_stderr)
 
     def test_operating_system(self):