software/caddy-frontend/test: use resource.Session as context manager

this prevents ResourceWarning because this way the sockets are closed

software/caddy-frontend/test/test.py

@@ -499,31 +499,32 @@ def fakeHTTPSResult(domain, path, port=HTTPS_PORT,
   headers.setdefault('Via', 'http/1.1 clientvia')
 
   session = requests.Session()
-  if source_ip is not None:
-    new_source = source.SourceAddressAdapter(source_ip)
-    session.mount('http://', new_source)
-    session.mount('https://', new_source)
-  socket_getaddrinfo = socket.getaddrinfo
-  try:
-    add_custom_dns(domain, port, TEST_IP)
-    socket.getaddrinfo = new_getaddrinfo
-    # Use a prepared request, to disable path normalization.
-    # We need this because some test checks requests with paths like
-    # /test-path/deep/.././deeper but we don't want the client to send
-    # /test-path/deeper
-    # See also https://github.com/psf/requests/issues/5289
-    url = 'https://%s:%s/%s' % (domain, port, path)
-    req = requests.Request(
-        method='GET',
-        url=url,
-        headers=headers,
-        cookies=cookies,
-    )
-    prepped = req.prepare()
-    prepped.url = url
-    return session.send(prepped, verify=False, allow_redirects=False)
-  finally:
-    socket.getaddrinfo = socket_getaddrinfo
+  with session:
+    if source_ip is not None:
+      new_source = source.SourceAddressAdapter(source_ip)
+      session.mount('http://', new_source)
+      session.mount('https://', new_source)
+    socket_getaddrinfo = socket.getaddrinfo
+    try:
+      add_custom_dns(domain, port, TEST_IP)
+      socket.getaddrinfo = new_getaddrinfo
+      # Use a prepared request, to disable path normalization.
+      # We need this because some test checks requests with paths like
+      # /test-path/deep/.././deeper but we don't want the client to send
+      # /test-path/deeper
+      # See also https://github.com/psf/requests/issues/5289
+      url = 'https://%s:%s/%s' % (domain, port, path)
+      req = requests.Request(
+          method='GET',
+          url=url,
+          headers=headers,
+          cookies=cookies,
+      )
+      prepped = req.prepare()
+      prepped.url = url
+      return session.send(prepped, verify=False, allow_redirects=False)
+    finally:
+      socket.getaddrinfo = socket_getaddrinfo
 
 
 def fakeHTTPResult(domain, path, port=HTTP_PORT,
@@ -541,17 +542,18 @@ def fakeHTTPResult(domain, path, port=HTTP_PORT,
   headers.setdefault('Via', 'http/1.1 clientvia')
   headers['Host'] = '%s:%s' % (domain, port)
   session = requests.Session()
-  if source_ip is not None:
-    new_source = source.SourceAddressAdapter(source_ip)
-    session.mount('http://', new_source)
-    session.mount('https://', new_source)
-
-  # Use a prepared request, to disable path normalization.
-  url = 'http://%s:%s/%s' % (TEST_IP, port, path)
-  req = requests.Request(method='GET', url=url, headers=headers)
-  prepped = req.prepare()
-  prepped.url = url
-  return session.send(prepped, allow_redirects=False)
+  with session:
+    if source_ip is not None:
+      new_source = source.SourceAddressAdapter(source_ip)
+      session.mount('http://', new_source)
+      session.mount('https://', new_source)
+
+    # Use a prepared request, to disable path normalization.
+    url = 'http://%s:%s/%s' % (TEST_IP, port, path)
+    req = requests.Request(method='GET', url=url, headers=headers)
+    prepped = req.prepare()
+    prepped.url = url
+    return session.send(prepped, allow_redirects=False)
 
 
 class TestHandler(BaseHTTPRequestHandler):