test helpers: http server context (#31774)

* http context

* fix

* fix

selfdrive/test/helpers.py

@@ -88,9 +88,8 @@ def read_segment_list(segment_list_path):
   return [(platform[2:], segment) for platform, segment in zip(seg_list[::2], seg_list[1::2], strict=True)]
 
 
-def with_http_server(func, handler=http.server.BaseHTTPRequestHandler, setup=None):
-  @wraps(func)
-  def inner(*args, **kwargs):
+@contextlib.contextmanager
+def http_server_context(handler, setup=None):
   host = '127.0.0.1'
   server = http.server.HTTPServer((host, 0), handler)
   port = server.server_port
@@ -101,10 +100,16 @@ def with_http_server(func, handler=http.server.BaseHTTPRequestHandler, setup=Non
     setup(host, port)
 
   try:
-      return func(*args, f'http://{host}:{port}', **kwargs)
+    yield (host, port)
   finally:
     server.shutdown()
     server.server_close()
     t.join()
 
+
+def with_http_server(func, handler=http.server.BaseHTTPRequestHandler, setup=None):
+  @wraps(func)
+  def inner(*args, **kwargs):
+    with http_server_context(handler, setup) as (host, port):
+      return func(*args, f"http://{host}:{port}", **kwargs)
   return inner