Title: [121507] trunk/Tools
- Revision
- 121507
- Author
- [email protected]
- Date
- 2012-06-28 19:13:39 -0700 (Thu, 28 Jun 2012)
Log Message
nrwt: don't try to catch worker exceptions in run_webkit_tests.__main__
https://bugs.webkit.org/show_bug.cgi?id=90125
Reviewed by Ojan Vafai.
It turns out run_webkit_tests.py wasn't really using
WorkerException and the catch we had for it was pointless. I've
removed the symbol import and moved it to the integration tests
where it is needed. Eventually the definition of the exception
moves to the broker module, and so minimizing the number of
users of it is a good thing.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
(MainTest.test_exception_raised):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121506 => 121507)
--- trunk/Tools/ChangeLog 2012-06-29 02:09:54 UTC (rev 121506)
+++ trunk/Tools/ChangeLog 2012-06-29 02:13:39 UTC (rev 121507)
@@ -1,5 +1,23 @@
2012-06-28 Dirk Pranke <[email protected]>
+ nrwt: don't try to catch worker exceptions in run_webkit_tests.__main__
+ https://bugs.webkit.org/show_bug.cgi?id=90125
+
+ Reviewed by Ojan Vafai.
+
+ It turns out run_webkit_tests.py wasn't really using
+ WorkerException and the catch we had for it was pointless. I've
+ removed the symbol import and moved it to the integration tests
+ where it is needed. Eventually the definition of the exception
+ moves to the broker module, and so minimizing the number of
+ users of it is a good thing.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (MainTest.test_exception_raised):
+
+2012-06-28 Dirk Pranke <[email protected]>
+
nrwt: clean up passing of log messages between processes
https://bugs.webkit.org/show_bug.cgi?id=90123
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (121506 => 121507)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-06-29 02:09:54 UTC (rev 121506)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-06-29 02:13:39 UTC (rev 121507)
@@ -37,7 +37,7 @@
import sys
from webkitpy.common.host import Host
-from webkitpy.layout_tests.controllers.manager import Manager, WorkerException
+from webkitpy.layout_tests.controllers.manager import Manager
from webkitpy.layout_tests.models import test_expectations
from webkitpy.layout_tests.port import port_options
from webkitpy.layout_tests.views import printing
@@ -455,7 +455,7 @@
# This mirrors what the shell normally does.
INTERRUPTED_EXIT_STATUS = signal.SIGINT + 128
sys.exit(INTERRUPTED_EXIT_STATUS)
- except WorkerException:
+ except Exception:
# This is a randomly chosen exit code that can be tested against to
# indicate that an unexpected exception occurred.
EXCEPTIONAL_EXIT_STATUS = 254
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (121506 => 121507)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-06-29 02:09:54 UTC (rev 121506)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-06-29 02:13:39 UTC (rev 121507)
@@ -50,6 +50,7 @@
from webkitpy.layout_tests import port
from webkitpy.layout_tests import run_webkit_tests
+from webkitpy.layout_tests.controllers.manager import WorkerException
from webkitpy.layout_tests.port import Port
from webkitpy.layout_tests.port.test import TestPort, TestDriver
from webkitpy.test.skip import skip_if
@@ -333,7 +334,7 @@
['failures/expected/exception.html', '--child-processes', '1'], tests_included=True)
if self.should_test_processes:
- self.assertRaises(run_webkit_tests.WorkerException, logging_run,
+ self.assertRaises(WorkerException, logging_run,
['--child-processes', '2', '--force', 'failures/expected/exception.html', 'passes/text.html'], tests_included=True)
def test_full_results_html(self):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
