Skip to content
Permalink
Browse files
2011-04-13 Dirk Pranke <dpranke@chromium.org>
        Reviewed by Tony Chang.

        new-run-webkit-tests --run-singly option is busted
        https://bugs.webkit.org/show_bug.cgi?id=55909

        Python's broken lexical scoping strikes again :(.

        * Scripts/webkitpy/layout_tests/layout_package/worker_mixin.py:
        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

Canonical link: https://commits.webkit.org/73558@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83801 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
dpranke committed Apr 14, 2011
1 parent d5ac6db commit de29f7342742277db4fcdce472144dbb7ac5b26e
Showing with 18 additions and 2 deletions.
  1. +12 −0 Tools/ChangeLog
  2. +2 −2 Tools/Scripts/webkitpy/layout_tests/layout_package/worker_mixin.py
  3. +4 −0 Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
@@ -1,3 +1,15 @@
2011-04-13 Dirk Pranke <dpranke@chromium.org>

Reviewed by Tony Chang.

new-run-webkit-tests --run-singly option is busted
https://bugs.webkit.org/show_bug.cgi?id=55909

Python's broken lexical scoping strikes again :(.

* Scripts/webkitpy/layout_tests/layout_package/worker_mixin.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

2011-04-13 Ojan Vafai <ojan@chromium.org>

Reviewed by Eric Seidel.
@@ -159,18 +159,18 @@ def _run_test_in_another_thread(self, test_input, thread_timeout_sec):
A TestResult
"""
worker = self
result = None

driver = worker._port.create_driver(worker._worker_number)
driver.start()

class SingleTestThread(threading.Thread):
def run(self):
result = worker._run_single_test(driver, test_input)
self.result = worker._run_single_test(driver, test_input)

thread = SingleTestThread()
thread.start()
thread.join(thread_timeout_sec)
result = getattr(thread, 'result', None)
if thread.isAlive():
# If join() returned with the thread still running, the
# DumpRenderTree is completely hung and there's nothing
@@ -325,6 +325,10 @@ def test_run_singly(self):
for batch in batch_tests_run:
self.assertEquals(len(batch), 1, '%s had too many tests' % ', '.join(batch))

def test_run_singly_actually_runs_tests(self):
res, _, _, _ = logging_run(['--run-singly', 'failures/unexpected'])
self.assertEquals(res, 5)

def test_single_file(self):
tests_run = get_tests_run(['passes/text.html'], tests_included=True, flatten_batches=True)
self.assertEquals(['passes/text.html'], tests_run)

0 comments on commit de29f73

Please sign in to comment.