Index: Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py |
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py |
index 9dd5b255e122e136e4003699c33eccb70175be79..f65b682fea8a8d1e1f1c13f0fda30331da23efb3 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py |
@@ -150,11 +150,12 @@ class DriverTest(unittest.TestCase): |
def stop(self, timeout=0.0): |
pass |
- def assert_crash(driver, error_line, crashed, name, pid, unresponsive=False): |
+ def assert_crash(driver, error_line, crashed, name, pid, unresponsive=False, leaked=False): |
self.assertEqual(driver._check_for_driver_crash(error_line), crashed) |
self.assertEqual(driver._crashed_process_name, name) |
self.assertEqual(driver._crashed_pid, pid) |
self.assertEqual(driver._subprocess_was_unresponsive, unresponsive) |
+ self.assertEqual(driver._check_for_leak(error_line), leaked) |
driver.stop() |
driver._server_process = FakeServerProcess(False) |
@@ -164,36 +165,49 @@ class DriverTest(unittest.TestCase): |
driver._crashed_pid = None |
driver._server_process = FakeServerProcess(False) |
driver._subprocess_was_unresponsive = False |
+ driver._leaked = False |
assert_crash(driver, '#CRASHED\n', True, 'FakeServerProcess', 1234) |
driver._crashed_process_name = None |
driver._crashed_pid = None |
driver._server_process = FakeServerProcess(False) |
driver._subprocess_was_unresponsive = False |
+ driver._leaked = False |
assert_crash(driver, '#CRASHED - WebProcess\n', True, 'WebProcess', None) |
driver._crashed_process_name = None |
driver._crashed_pid = None |
driver._server_process = FakeServerProcess(False) |
driver._subprocess_was_unresponsive = False |
+ driver._leaked = 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) |
driver._subprocess_was_unresponsive = False |
+ driver._leaked = False |
assert_crash(driver, '#PROCESS UNRESPONSIVE - WebProcess (pid 8675)\n', True, 'WebProcess', 8675, True) |
driver._crashed_process_name = None |
driver._crashed_pid = None |
driver._server_process = FakeServerProcess(False) |
driver._subprocess_was_unresponsive = False |
+ driver._leaked = False |
assert_crash(driver, '#CRASHED - renderer (pid 8675)\n', True, 'renderer', 8675) |
driver._crashed_process_name = None |
driver._crashed_pid = None |
+ driver._server_process = FakeServerProcess(False) |
+ driver._subprocess_was_unresponsive = False |
+ driver._leaked = False |
+ assert_crash(driver, '#LEAK - renderer pid 8675 ({"numberOfLiveDocuments":[2,3]})\n', False, None, None, False, True) |
+ |
+ driver._crashed_process_name = None |
+ driver._crashed_pid = None |
driver._server_process = FakeServerProcess(True) |
driver._subprocess_was_unresponsive = False |
+ driver._leaked = False |
assert_crash(driver, '', True, 'FakeServerProcess', 1234) |
def test_creating_a_port_does_not_write_to_the_filesystem(self): |