From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 3 Jun 2022 20:40:20 +0000 (-0700)
Subject: gh-84461: Skip dtrace/network tests that are enabled by -u all (GH-93473)
X-Git-Tag: v3.11.0b4~234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4113be63c27faf52c5ce79f1afa3b9f6e33de46;p=thirdparty%2FPython%2Fcpython.git

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 513ada7cb1f3..35c4efb01af2 100644
--- 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 8a436ad123b8..4b971deacc1a 100644
--- 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"))