Title: [119304] trunk/Tools
- Revision
- 119304
- Author
- [email protected]
- Date
- 2012-06-01 18:00:48 -0700 (Fri, 01 Jun 2012)
Log Message
Unreviewed, rolling out r119297.
http://trac.webkit.org/changeset/119297
https://bugs.webkit.org/show_bug.cgi?id=88156
May have broken Chromium bots (Requested by rniwa on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-06-01
* Scripts/webkitpy/layout_tests/port/webkit.py:
(WebKitDriver.__del__):
(WebKitDriver.run_test):
* Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
(WebKitDriverTest.test_check_for_driver_crash):
(WebKitDriverTest.test_stop_cleans_up_properly):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (119303 => 119304)
--- trunk/Tools/ChangeLog 2012-06-02 00:22:31 UTC (rev 119303)
+++ trunk/Tools/ChangeLog 2012-06-02 01:00:48 UTC (rev 119304)
@@ -1,3 +1,18 @@
+2012-06-01 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r119297.
+ http://trac.webkit.org/changeset/119297
+ https://bugs.webkit.org/show_bug.cgi?id=88156
+
+ May have broken Chromium bots (Requested by rniwa on #webkit).
+
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+ (WebKitDriver.__del__):
+ (WebKitDriver.run_test):
+ * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+ (WebKitDriverTest.test_check_for_driver_crash):
+ (WebKitDriverTest.test_stop_cleans_up_properly):
+
2012-06-01 Dirk Pranke <[email protected]>
nrwt seems to leak tmpdirs
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (119303 => 119304)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2012-06-02 00:22:31 UTC (rev 119303)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2012-06-02 01:00:48 UTC (rev 119304)
@@ -462,7 +462,8 @@
self._server_process = None
def __del__(self):
- self.stop()
+ assert(self._server_process is None)
+ assert(self._driver_tempdir is None)
def cmd_line(self, pixel_tests, per_test_args):
cmd = self._command_wrapper(self._port.get_option('wrapper'))
@@ -487,7 +488,6 @@
return cmd
def _start(self, pixel_tests, per_test_args):
- self.stop()
self._driver_tempdir = self._port._filesystem.mkdtemp(prefix='%s-' % self._port.driver_name())
server_name = self._port.driver_name()
environment = self._port.setup_environ_for_server(server_name)
@@ -565,7 +565,8 @@
def run_test(self, driver_input):
start_time = time.time()
- self.start(driver_input.should_run_pixel_test, driver_input.args)
+ if not self._server_process:
+ self._start(driver_input.should_run_pixel_test, driver_input.args)
self.error_from_test = str()
self.err_seen_eof = False
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (119303 => 119304)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2012-06-02 00:22:31 UTC (rev 119303)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2012-06-02 01:00:48 UTC (rev 119304)
@@ -349,7 +349,7 @@
driver._server_process = FakeServerProcess(False)
driver._subprocess_was_unresponsive = False
assert_crash(driver, '#CRASHED - WebProcess (pid 8675)\n', True, 'WebProcess', 8675)
-
+
driver._crashed_process_name = None
driver._crashed_pid = None
driver._server_process = FakeServerProcess(False)
@@ -376,11 +376,3 @@
self.assertNotEquals(last_tmpdir, None)
driver.stop()
self.assertFalse(port._filesystem.isdir(last_tmpdir))
-
- def test_two_starts_cleans_up_properly(self):
- port = TestWebKitPort()
- driver = WebKitDriver(port, 0, pixel_tests=True)
- driver.start(True, [])
- last_tmpdir = port._filesystem.last_tmpdir
- driver._start(True, [])
- self.assertFalse(port._filesystem.isdir(last_tmpdir))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
