[Python-checkins] gh-84461: Skip dtrace/network tests that are enabled by -u all (GH-93473)

tiran webhook-mailer at python.org
Fri Jun 3 16:15:05 EDT 2022


https://github.com/python/cpython/commit/1a8a0ddb1c62ef9aff598e7e3e3a65cf35353932
commit: 1a8a0ddb1c62ef9aff598e7e3e3a65cf35353932
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-06-03T22:14:31+02:00
summary:

gh-84461: Skip dtrace/network tests that are enabled by -u all (GH-93473)

files:
M Lib/test/support/__init__.py
M Lib/test/test_dtrace.py

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index e23ffee22d1cd..780d04b020da4 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -305,6 +305,8 @@ def requires(resource, msg=None):
         if msg is None:
             msg = "Use of the %r resource not enabled" % resource
         raise ResourceDenied(msg)
+    if resource in {"network", "urlfetch"} and not has_socket_support:
+        raise ResourceDenied("No socket support")
     if resource == 'gui' and not _is_gui_available():
         raise ResourceDenied(_is_gui_available.reason)
 
diff --git a/Lib/test/test_dtrace.py b/Lib/test/test_dtrace.py
index 8a436ad123b80..4b971deacc1a5 100644
--- a/Lib/test/test_dtrace.py
+++ b/Lib/test/test_dtrace.py
@@ -6,9 +6,14 @@
 import types
 import unittest
 
+from test import support
 from test.support import findfile
 
 
+if not support.has_subprocess_support:
+    raise unittest.SkipTest("test module requires subprocess")
+
+
 def abspath(filename):
     return os.path.abspath(findfile(filename, subdir="dtracedata"))
 



More information about the Python-checkins mailing list