<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182566] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182566">182566</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2015-04-08 14:12:44 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[XvfbDriver] Regular expression used to match running X servers fails on Fedora 22.
https://bugs.webkit.org/show_bug.cgi?id=143530
Reviewed by Žan Doberšek.
Assume that the default value for display (:0) is reserved and start checking on :1
Adjust webkitpy test and include two new test cases for this bug (display number not specified)
and for X server named Xorg.bin (previous bug 1376599)
* Scripts/webkitpy/port/xvfbdriver.py:
(XvfbDriver._next_free_display)
* Scripts/webkitpy/port/xvfbdriver_unittest.py:
(XvfbDriverTest.test_start_no_pixel_tests):
(XvfbDriverTest.test_start_pixel_tests):
(XvfbDriverTest.test_start_arbitrary_worker_number):
(XvfbDriverTest.test_next_free_display):
(XvfbDriverTest.test_start_next_worker):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportxvfbdriverpy">trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportxvfbdriver_unittestpy">trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182565 => 182566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-08 21:00:19 UTC (rev 182565)
+++ trunk/Tools/ChangeLog 2015-04-08 21:12:44 UTC (rev 182566)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-04-08 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [XvfbDriver] Regular expression used to match running X servers fails on Fedora 22.
+ https://bugs.webkit.org/show_bug.cgi?id=143530
+
+ Reviewed by Žan Doberšek.
+
+ Assume that the default value for display (:0) is reserved and start checking on :1
+ Adjust webkitpy test and include two new test cases for this bug (display number not specified)
+ and for X server named Xorg.bin (previous bug 1376599)
+
+ * Scripts/webkitpy/port/xvfbdriver.py:
+ (XvfbDriver._next_free_display)
+ * Scripts/webkitpy/port/xvfbdriver_unittest.py:
+ (XvfbDriverTest.test_start_no_pixel_tests):
+ (XvfbDriverTest.test_start_pixel_tests):
+ (XvfbDriverTest.test_start_arbitrary_worker_number):
+ (XvfbDriverTest.test_next_free_display):
+ (XvfbDriverTest.test_start_next_worker):
</ins><span class="cx"> 2015-04-08 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Block popups from content extensions.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportxvfbdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py (182565 => 182566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2015-04-08 21:00:19 UTC (rev 182565)
+++ trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2015-04-08 21:12:44 UTC (rev 182566)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> match = re.match('(X|Xvfb|Xorg|Xorg\.bin)\s+.*\s:(?P<screen_number>\d+)', pid)
</span><span class="cx"> if match:
</span><span class="cx"> reserved_screens.add(int(match.group('screen_number')))
</span><del>- for i in range(99):
</del><ins>+ for i in range(1, 99):
</ins><span class="cx"> if i not in reserved_screens:
</span><span class="cx"> _guard_lock_file = self._port.host.filesystem.join('/tmp', 'WebKitXvfb.lock.%i' % i)
</span><span class="cx"> self._guard_lock = self._port.host.make_file_lock(_guard_lock_file)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportxvfbdriver_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py (182565 => 182566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py 2015-04-08 21:00:19 UTC (rev 182565)
+++ trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py 2015-04-08 21:12:44 UTC (rev 182566)
</span><span class="lines">@@ -68,49 +68,59 @@
</span><span class="cx">
</span><span class="cx"> def test_start_no_pixel_tests(self):
</span><span class="cx"> driver = self.make_driver()
</span><del>- expected_logs = ("MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
- self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0")
</del><ins>+ expected_logs = ("MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':1', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
+ self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":1")
</ins><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span><span class="cx"> def test_start_pixel_tests(self):
</span><span class="cx"> driver = self.make_driver()
</span><del>- expected_logs = ("MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
- self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True)
</del><ins>+ expected_logs = ("MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':1', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
+ self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":1", pixel_tests=True)
</ins><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span><span class="cx"> def test_start_arbitrary_worker_number(self):
</span><span class="cx"> driver = self.make_driver(worker_number=17)
</span><del>- expected_logs = ("MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
- self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True)
</del><ins>+ expected_logs = ("MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':1', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
+ self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":1", pixel_tests=True)
</ins><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span><span class="cx"> def test_next_free_display(self):
</span><del>- output = "Xorg /usr/bin/X :0 -auth /var/run/lightdm/root/:0 -nolisten tcp vt7 -novtswitch -background none\nXvfb Xvfb :1 -screen 0 800x600x24 -nolisten tcp"
</del><ins>+ output = "Xorg /usr/bin/X :1 -auth /var/run/lightdm/root/:1 -nolisten tcp vt7 -novtswitch -background none\nXvfb Xvfb :2 -screen 0 800x600x24 -nolisten tcp"
</ins><span class="cx"> executive = MockExecutive2(output)
</span><span class="cx"> driver = self.make_driver(executive=executive)
</span><ins>+ self.assertEqual(driver._next_free_display(), 3)
+ self.cleanup_driver(driver)
+ output = "X /usr/bin/X :1 vt7 -nolisten tcp -auth /var/run/xauth/A:0-8p7Ybb"
+ executive = MockExecutive2(output)
+ driver = self.make_driver(executive=executive)
</ins><span class="cx"> self.assertEqual(driver._next_free_display(), 2)
</span><span class="cx"> self.cleanup_driver(driver)
</span><del>- output = "X /usr/bin/X :0 vt7 -nolisten tcp -auth /var/run/xauth/A:0-8p7Ybb"
</del><ins>+ output = "Xvfb Xvfb :1 -screen 0 800x600x24 -nolisten tcp"
</ins><span class="cx"> executive = MockExecutive2(output)
</span><span class="cx"> driver = self.make_driver(executive=executive)
</span><del>- self.assertEqual(driver._next_free_display(), 1)
</del><ins>+ self.assertEqual(driver._next_free_display(), 2)
</ins><span class="cx"> self.cleanup_driver(driver)
</span><del>- output = "Xvfb Xvfb :0 -screen 0 800x600x24 -nolisten tcp"
</del><ins>+ output = "Xvfb Xvfb :2 -screen 0 800x600x24 -nolisten tcp\nXvfb Xvfb :1 -screen 0 800x600x24 -nolisten tcp\nXvfb Xvfb :3 -screen 0 800x600x24 -nolisten tcp"
</ins><span class="cx"> executive = MockExecutive2(output)
</span><span class="cx"> driver = self.make_driver(executive=executive)
</span><del>- self.assertEqual(driver._next_free_display(), 1)
</del><ins>+ self.assertEqual(driver._next_free_display(), 4)
</ins><span class="cx"> self.cleanup_driver(driver)
</span><del>- output = "Xvfb Xvfb :1 -screen 0 800x600x24 -nolisten tcp\nXvfb Xvfb :0 -screen 0 800x600x24 -nolisten tcp\nXvfb Xvfb :3 -screen 0 800x600x24 -nolisten tcp"
</del><ins>+ output = "Xorg.bin /usr/libexec/Xorg.bin :1 -background none -noreset -verbose 3 -logfile /dev/null -auth /run/gdm/auth-for-gdm-Zt8Eq2/database -seat seat0 -nolisten tcp vt1"
</ins><span class="cx"> executive = MockExecutive2(output)
</span><span class="cx"> driver = self.make_driver(executive=executive)
</span><span class="cx"> self.assertEqual(driver._next_free_display(), 2)
</span><span class="cx"> self.cleanup_driver(driver)
</span><ins>+ output = "/usr/libexec/Xorg vt2 -displayfd 3 -auth /run/user/1000/gdm/Xauthority -nolisten tcp -background none -noreset -keeptty -verbose 3"
+ executive = MockExecutive2(output)
+ driver = self.make_driver(executive=executive)
+ self.assertEqual(driver._next_free_display(), 1)
+ self.cleanup_driver(driver)
</ins><span class="cx">
</span><span class="cx"> def test_start_next_worker(self):
</span><span class="cx"> driver = self.make_driver()
</span><del>- driver._next_free_display = lambda: 0
- expected_logs = ("MOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
- self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True)
</del><ins>+ driver._next_free_display = lambda: 1
+ expected_logs = ("MOCK popen: ['Xvfb', ':1', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
+ self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":1", pixel_tests=True)
</ins><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx"> driver = self.make_driver()
</span><span class="cx"> driver._next_free_display = lambda: 3
</span></span></pre>
</div>
</div>
</body>
</html>