Title: [134060] trunk/Tools
- Revision
- 134060
- Author
- [email protected]
- Date
- 2012-11-09 06:28:37 -0800 (Fri, 09 Nov 2012)
Log Message
webkitpy/layouttests integration test fails if high shards/processes environment variables are used
https://bugs.webkit.org/show_bug.cgi?id=101455
Reviewed by Dirk Pranke.
Updating test to disregard WEBKIT_TEST_MAX_LOCKED_SHARDS environment variable.
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
(MainTest.test_max_locked_shards):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (134059 => 134060)
--- trunk/Tools/ChangeLog 2012-11-09 14:25:47 UTC (rev 134059)
+++ trunk/Tools/ChangeLog 2012-11-09 14:28:37 UTC (rev 134060)
@@ -1,3 +1,15 @@
+2012-11-09 Dominik Röttsches <[email protected]>
+
+ webkitpy/layouttests integration test fails if high shards/processes environment variables are used
+ https://bugs.webkit.org/show_bug.cgi?id=101455
+
+ Reviewed by Dirk Pranke.
+
+ Updating test to disregard WEBKIT_TEST_MAX_LOCKED_SHARDS environment variable.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (MainTest.test_max_locked_shards):
+
2012-11-09 Raphael Kubo da Costa <[email protected]>
[EFL][DRT] Force a repaint before tracking repaint rects.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (134059 => 134060)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-11-09 14:25:47 UTC (rev 134059)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-11-09 14:28:37 UTC (rev 134060)
@@ -33,6 +33,7 @@
import itertools
import json
import logging
+import os
import platform
import Queue
import re
@@ -309,10 +310,19 @@
self.assertTrue(len(batch) <= 2, '%s had too many tests' % ', '.join(batch))
def test_max_locked_shards(self):
+ # Tests for the default of using one locked shard even in the case of more than one child process.
if not self.should_test_processes:
return
+ save_env_webkit_test_max_locked_shards = None
+ if "WEBKIT_TEST_MAX_LOCKED_SHARDS" in os.environ:
+ save_env_webkit_test_max_locked_shards = os.environ["WEBKIT_TEST_MAX_LOCKED_SHARDS"]
+ del os.environ["WEBKIT_TEST_MAX_LOCKED_SHARDS"]
_, _, regular_output, _ = logging_run(['--debug-rwt-logging', '--child-processes', '2'], shared_port=False)
- self.assertTrue(any(['(1 locked)' in line for line in regular_output.buflist]))
+ try:
+ self.assertTrue(any(['(1 locked)' in line for line in regular_output.buflist]))
+ finally:
+ if save_env_webkit_test_max_locked_shards:
+ os.environ["WEBKIT_TEST_MAX_LOCKED_SHARDS"] = save_env_webkit_test_max_locked_shards
def test_child_processes_2(self):
if self.should_test_processes:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
