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

(cherry picked from commit 1a8a0ddb1c62ef9aff598e7e3e3a65cf35353932)

Co-authored-by: Christian Heimes <christian@python.org>

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 513ada7cb1f3d7d0e17c0ef87cb2baabc7e97b9a..35c4efb01af27f1e79a8368dff0d676b2983a329 100644 (file)
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -304,6 +304,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 8a436ad123b80f7e8d6355ffaf6adb90212fa8c3..4b971deacc1a5c28a2ef3390c4e04b5b5deaf32d 100644 (file)
--- a/Lib/test/test_dtrace.py
+++ b/Lib/test/test_dtrace.py
@@ -6,9 +6,14 @@ import sys
 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"))