Skip to content

Fix SSL timeout in doctest / internet feature #36696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 14, 2023
Merged

Fix SSL timeout in doctest / internet feature #36696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a755e9
Fix ssl timeout in testing internet feature
tornaria Nov 10, 2023
4a70c1e
Exclude external software from --hide=all and --hide=optional
tornaria Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/sage/doctest/control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,11 +457,15 @@ def __init__(self, options, args):
options.hide.discard('all')
from sage.features.all import all_features
feature_names = {f.name for f in all_features() if not f.is_standard()}
from sage.doctest.external import external_software
feature_names.difference_update(external_software)
options.hide = options.hide.union(feature_names)
if 'optional' in options.hide:
options.hide.discard('optional')
from sage.features.all import all_features
feature_names = {f.name for f in all_features() if f.is_optional()}
from sage.doctest.external import external_software
feature_names.difference_update(external_software)
options.hide = options.hide.union(feature_names)

options.disabled_optional = set()
Expand Down
2 changes: 1 addition & 1 deletion src/sage/features/internet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def _is_present(self):
try:
urlopen(req, timeout=1, context=default_context())
return FeatureTestResult(self, True)
except urllib.error.URLError:
except (urllib.error.URLError, TimeoutError):
return FeatureTestResult(self, False)


Expand Down