[tests] linkcheck: bind each test HTTP server to a unique port per-testcase.

.ruff.toml

@@ -410,6 +410,9 @@ select = [
 "tests/test_util/test_util_typing.py" = ["UP006", "UP035"]
 "tests/test_util/typing_test_data.py" = ["FA100", "UP006", "UP035"]
 
+# linkcheck builder tests use the contextmanager variable in subsequent 'with' blocks
+"tests/test_builders/test_build_linkcheck.py" = ["SIM117"]
+
 "utils/*" = [
     "T201",  # whitelist ``print`` for stdout messages
     "ANN",  # utilities don't need annotations

pyproject.toml

@@ -90,6 +90,7 @@ lint = [
     "pytest>=6.0",
 ]
 test = [
+    "atomos>=0.3.1",
     "pytest>=6.0",
     "html5lib",
     "cython>=3.0",

sphinx/builders/linkcheck.py

@@ -13,7 +13,7 @@
 from queue import PriorityQueue, Queue
 from threading import Thread
 from typing import TYPE_CHECKING, NamedTuple, cast
-from urllib.parse import unquote, urlparse, urlsplit, urlunparse
+from urllib.parse import unquote, urljoin, urlparse, urlsplit, urlunparse
 
 from docutils import nodes
 from requests.exceptions import ConnectionError, HTTPError, SSLError, TooManyRedirects
@@ -176,23 +176,27 @@ def run(self, **kwargs: Any) -> None:
         builder = cast(CheckExternalLinksBuilder, self.app.builder)
         hyperlinks = builder.hyperlinks
         docname = self.env.docname
+        base_uri = builder.config.html_baseurl or None
 
         # reference nodes
         for refnode in self.document.findall(nodes.reference):
             if 'refuri' in refnode:
                 uri = refnode['refuri']
+                uri = urljoin(base_uri, uri)
                 _add_uri(self.app, uri, refnode, hyperlinks, docname)
 
         # image nodes
         for imgnode in self.document.findall(nodes.image):
             uri = imgnode['candidates'].get('?')
-            if uri and '://' in uri:
+            if uri and '://' in uri or base_uri:
+                uri = urljoin(base_uri, uri)
                 _add_uri(self.app, uri, imgnode, hyperlinks, docname)
 
         # raw nodes
         for rawnode in self.document.findall(nodes.raw):
             uri = rawnode.get('source')
-            if uri and '://' in uri:
+            if uri and '://' in uri or base_uri:
+                uri = urljoin(base_uri, uri)
                 _add_uri(self.app, uri, rawnode, hyperlinks, docname)
 
 

sphinx/environment/collectors/asset.py

@@ -54,6 +54,9 @@ def process_doc(self, app: Sphinx, doctree: nodes.document) -> None:
             if imguri.find('://') != -1:
                 candidates['?'] = imguri
                 continue
+            if imguri.startswith('<') and imguri.endswith('>'):
+                candidates['?'] = imguri[1:-1]
+                continue
 
             if imguri.endswith(os.extsep + '*'):
                 # Update `node['uri']` to a relative path from srcdir

tests/roots/test-linkcheck-anchors-ignore-for-url/index.rst

@@ -1,7 +1,7 @@
-* `Example valid url, no anchor <http://localhost:7777/valid>`_
-* `Example valid url, valid anchor <http://localhost:7777/valid#valid-anchor>`_
-* `Example valid url, invalid anchor <http://localhost:7777/valid#invalid-anchor>`_
-* `Example ignored url, no anchor <http://localhost:7777/ignored>`_
-* `Example ignored url, invalid anchor <http://localhost:7777/ignored#invalid-anchor>`_
-* `Example invalid url, no anchor <http://localhost:7777/invalid>`_
-* `Example invalid url, invalid anchor <http://localhost:7777/invalid#anchor>`_
+* `Example valid url, no anchor </valid>`_
+* `Example valid url, valid anchor </valid#valid-anchor>`_
+* `Example valid url, invalid anchor </valid#invalid-anchor>`_
+* `Example ignored url, no anchor </ignored>`_
+* `Example ignored url, invalid anchor </ignored#invalid-anchor>`_
+* `Example invalid url, no anchor </invalid>`_
+* `Example invalid url, invalid anchor </invalid#anchor>`_

tests/roots/test-linkcheck-localserver-anchor/index.rst

@@ -1 +1 @@
-`local server <http://localhost:7777/#anchor>`_
+`local server </#anchor>`_

tests/roots/test-linkcheck-localserver-https/index.rst

@@ -1 +1 @@
-`HTTPS server <https://localhost:7777/>`_
+`HTTPS server </>`_

tests/roots/test-linkcheck-localserver-warn-redirects/index.rst

@@ -1,3 +1,3 @@
-`local server1 <http://localhost:7777/path1>`_
+`local server1 </path1>`_
 
-`local server2 <http://localhost:7777/path2>`_
+`local server2 </path2>`_

tests/roots/test-linkcheck-localserver/index.rst

@@ -1 +1 @@
-`local server <http://localhost:7777/>`_
+`local server </>`_

tests/roots/test-linkcheck/links.rst

@@ -1,14 +1,14 @@
 Some additional anchors to exercise ignore code
 
-* `Valid url <http://localhost:7777/>`_
-* `Bar anchor invalid (trailing slash) <http://localhost:7777/#!bar>`_
-* `Bar anchor invalid <http://localhost:7777#!bar>`_ tests that default ignore anchor of #! does not need to be prefixed with /
-* `Top anchor invalid <http://localhost:7777/#top>`_
-* `'does-not-exist' anchor invalid <http://localhost:7777#does-not-exist>`_
-* `Valid local file <conf.py>`_
+* `Valid url </>`_
+* `Bar anchor invalid (trailing slash) </#!bar>`_
+* `Bar anchor invalid <#!bar>`_ tests that default ignore anchor of #! does not need to be prefixed with /
+* `Top anchor invalid </#top>`_
+* `'does-not-exist' anchor invalid <#does-not-exist>`_
+* `Valid local file <file:conf.py>`_
 * `Invalid local file <path/to/notfound>`_
 
-.. image:: http://localhost:7777/image.png
-.. figure:: http://localhost:7777/image2.png
+.. image:: <image.png>
+.. figure:: <image2.png>
 
-* `Valid anchored url <http://localhost:7777/anchor.html#found>`_
+* `Valid anchored url <anchor.html#found>`_