varlink: rework server_factory fixture to take a service

Construct `ServiceRequestHandler` once and re-use it in the fixture.

Author: jelly

varlink/tests/conftest.py

@@ -5,12 +5,16 @@
 import varlink
 
 
+class ServiceRequestHandler(varlink.RequestHandler): ...
+
+
 @pytest.fixture
 def server_factory():
     servers = []
 
-    def _create_server(address: str, request_handler: varlink.RequestHandler):
-        server = varlink.ThreadingServer(address, request_handler)
+    def _create_server(address: str, service: varlink.Service):
+        ServiceRequestHandler.service = service
+        server = varlink.ThreadingServer(address, ServiceRequestHandler)
         ready_event = threading.Event()
 
         def run_server() -> None:

varlink/tests/test_basic_network.py

@@ -16,10 +16,6 @@
 )
 
 
-class ServiceRequestHandler(varlink.RequestHandler):
-    service = service
-
-
 test_addresses = [
     ("tcp:127.0.0.1:23450", False, ""),
     (
@@ -40,7 +36,7 @@ def test_address(server_factory, address, skip, skip_reason) -> None:
     if skip:
         pytest.skip(skip_reason)
 
-    server_factory(address, ServiceRequestHandler)
+    server_factory(address, service)
 
     with varlink.Client(address) as client, client.open("org.varlink.service") as connection:
         info = connection.GetInfo()
@@ -57,7 +53,7 @@ def test_address(server_factory, address, skip, skip_reason) -> None:
 
 def test_reuse_open(server_factory) -> None:
     address = "tcp:127.0.0.1:23450"
-    server_factory(address, ServiceRequestHandler)
+    server_factory(address, service)
 
     with varlink.Client(address) as client:
         connection = client.open_connection()
@@ -73,4 +69,4 @@ def test_reuse_open(server_factory) -> None:
 def test_wrong_url(server_factory) -> None:
     address = f"uenix:org.varlink.service_wrong_url_test_{os.getpid()}"
     with pytest.raises(ConnectionError):
-        server_factory(address, ServiceRequestHandler)
+        server_factory(address, service)

varlink/tests/test_orgexamplemore.py

@@ -75,10 +75,6 @@ def run_client(client):
 )
 
 
-class ServiceRequestHandler(varlink.RequestHandler):
-    service = service
-
-
 class ActionFailed(varlink.VarlinkError):
     def __init__(self, reason):
         varlink.VarlinkError.__init__(
@@ -138,7 +134,7 @@ def TestObject(self, object):
 
 
 def run_server(address):
-    with varlink.ThreadingServer(address, ServiceRequestHandler) as server:
+    with varlink.ThreadingServer(address, service) as server:
         print("Listening on", server.server_address)
         try:
             server.serve_forever()
@@ -216,7 +212,7 @@ def epilog():
 def test_service(server_factory) -> None:
     address = "tcp:127.0.0.1:23451"
     Example.sleep_duration = 0.1
-    server_factory(address, ServiceRequestHandler)
+    server_factory(address, service)
 
     client = varlink.Client.new_with_address(address)
 

varlink/tests/test_server_encoding.py

@@ -49,10 +49,6 @@ def default(self, obj):
 )
 
 
-class ServiceRequestHandler(varlink.RequestHandler):
-    service = service
-
-
 @service.interface("org.example.encoding")
 class EncodingExample:
     sleep_duration = 1
@@ -83,7 +79,7 @@ def GetOrder(self, num):
 
 def test_ping(server_factory):
     address = "tcp:127.0.0.1:23451"
-    server_factory(address, ServiceRequestHandler)
+    server_factory(address, service)
     client = varlink.Client.new_with_address(address)
     with client.open("org.example.encoding") as conn:
         response = conn.Ping("Foo")
@@ -92,7 +88,7 @@ def test_ping(server_factory):
 
 def test_get_order(server_factory):
     address = "tcp:127.0.0.1:23451"
-    server_factory(address, ServiceRequestHandler)
+    server_factory(address, service)
 
     client = varlink.Client.new_with_address(address)
     with client.open("org.example.encoding") as conn: