summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2022-06-03 20:14:31 (GMT)
committerGitHub <noreply@github.com>2022-06-03 20:14:31 (GMT)
commit1a8a0ddb1c62ef9aff598e7e3e3a65cf35353932 (patch)
treef061baf53910003c782913337a0108e062a4add3
parentd52ffc1d1f14576605195e4ed3a4d5d63497c3e3 (diff)
downloadcpython-1a8a0ddb1c62ef9aff598e7e3e3a65cf35353932.zip
cpython-1a8a0ddb1c62ef9aff598e7e3e3a65cf35353932.tar.gz
cpython-1a8a0ddb1c62ef9aff598e7e3e3a65cf35353932.tar.bz2
gh-84461: Skip dtrace/network tests that are enabled by -u all (GH-93473)
-rw-r--r--Lib/test/support/__init__.py2
-rw-r--r--Lib/test/test_dtrace.py5
2 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index e23ffee..780d04b 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 8a436ad..4b971de 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"))