Title: [240433] trunk/Tools
- Revision
- 240433
- Author
- [email protected]
- Date
- 2019-01-24 06:34:50 -0800 (Thu, 24 Jan 2019)
Log Message
[WPE] Remove hard dependency on subprocess32 for the API tests
Rubber-stamped by Carlos Garcia Campos.
* glib/api_test_runner.py:
(TestRunner._run_test_qt): Lazily import subprocess32 and check
its presence only when running WPEQt tests.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (240432 => 240433)
--- trunk/Tools/ChangeLog 2019-01-24 12:04:36 UTC (rev 240432)
+++ trunk/Tools/ChangeLog 2019-01-24 14:34:50 UTC (rev 240433)
@@ -1,3 +1,13 @@
+2019-01-24 Philippe Normand <[email protected]>
+
+ [WPE] Remove hard dependency on subprocess32 for the API tests
+
+ Rubber-stamped by Carlos Garcia Campos.
+
+ * glib/api_test_runner.py:
+ (TestRunner._run_test_qt): Lazily import subprocess32 and check
+ its presence only when running WPEQt tests.
+
2019-01-24 Carlos Garcia Campos <[email protected]>
[GLIB] Expose _javascript_Core options in GLib public API
Modified: trunk/Tools/glib/api_test_runner.py (240432 => 240433)
--- trunk/Tools/glib/api_test_runner.py 2019-01-24 12:04:36 UTC (rev 240432)
+++ trunk/Tools/glib/api_test_runner.py 2019-01-24 14:34:50 UTC (rev 240433)
@@ -32,7 +32,10 @@
from webkitpy.common.timeout_context import Timeout
if os.name == 'posix' and sys.version_info[0] < 3:
- import subprocess32 as subprocess
+ try:
+ import subprocess32 as subprocess
+ except ImportError:
+ import subprocess
else:
import subprocess
@@ -166,6 +169,10 @@
env['QML2_IMPORT_PATH'] = common.library_build_path('qml')
name = os.path.basename(test_program)
+ if not hasattr(subprocess, 'TimeoutExpired'):
+ print("Can't run WPEQt test in Python2 without subprocess32")
+ return {name: "FAIL"}
+
try:
output = subprocess.check_output([test_program, ], stderr=subprocess.STDOUT,
env=env, timeout=self._options.timeout)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
