Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(995)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py

Issue 2821543003: In run-webkit-tests, start xvfb if necessary. (Closed)
Patch Set: Check process after starting, wait after killing, change stderr redirect to DEVNULL Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py
index fe363f73c44d767964611998b915a8c11137a37d..9b6a25e55f438b7eb52381d4a3d731e2a2cf9052 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py
@@ -114,3 +114,33 @@ class LinuxPortTest(port_testcase.PortTestCase):
port.clean_up_test_run()
self.assertEqual(port.host.environ['HOME'], '/home/user')
self.assertFalse(port.host.filesystem.exists(temp_home_dir))
+
+ def test_setup_test_run_starts_xvfb(self):
+ port = self.make_port()
+ port.host.executive = MockExecutive(exit_code=1)
+ port.setup_test_run()
+ self.assertEqual(
+ port.host.executive.calls,
+ [
+ ['xdpyinfo', '-display', ':99'],
+ ['Xvfb', ':99', '-screen', '0', '1280x800x24', '-ac', '-dpi', '96'],
+ ])
+ env = port.setup_environ_for_server()
+ self.assertEqual(env['DISPLAY'], ':99')
+
+ def test_setup_test_runs_finds_free_display(self):
+ port = self.make_port()
+ port.host.executive = MockExecutive(
+ run_command_fn=lambda args: 1 if ':102' in args else 0)
+ port.setup_test_run()
+ self.assertEqual(
+ port.host.executive.calls,
+ [
+ ['xdpyinfo', '-display', ':99'],
+ ['xdpyinfo', '-display', ':100'],
+ ['xdpyinfo', '-display', ':101'],
+ ['xdpyinfo', '-display', ':102'],
+ ['Xvfb', ':102', '-screen', '0', '1280x800x24', '-ac', '-dpi', '96'],
+ ])
+ env = port.setup_environ_for_server()
+ self.assertEqual(env['DISPLAY'], ':102')
« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698