3838
3939from pubtools .sign .clients .msg import _MsgClient
4040
41-
4241LOG = logging .getLogger ("pubtools.sign.signers.radas" )
4342LOG .addHandler (logging .StreamHandler (sys .stdout ))
4443
@@ -258,8 +257,16 @@ def on_message(self, event):
258257 sender .send (reply )
259258
260259
261- def run_broker (broker , stdout ):
262- sys .stdout = stdout
260+ def run_broker (port ): # broker, stdout):
261+ broker = Container (_Broker (f"localhost:{ port } " ))
262+ # sys.stdout = stdout
263+ broker .run ()
264+ return broker
265+
266+
267+ def run_broken_broker (port ): # broker, stdout):
268+ broker = Container (_Broker (f"localhost:{ port } " ))
269+ # sys.stdout = stdout
263270 broker .run ()
264271
265272
@@ -314,21 +321,19 @@ def f_find_available_port_for_broken():
314321@fixture (scope = "session" )
315322def f_qpid_broker (f_find_available_port ):
316323 LOG .info ("starting broker" , f"localhost:{ f_find_available_port } " )
317- broker = Container (_Broker (f"localhost:{ f_find_available_port } " ))
318- p = Process (target = run_broker , args = (broker , sys .stdout ))
324+ p = Process (target = run_broker , args = (f_find_available_port ,))
319325 p .start ()
320- yield (broker , f_find_available_port )
326+ yield (f_find_available_port , )
321327 LOG .info ("destroying qpid broker" )
322328 p .terminate ()
323329
324330
325331@fixture (scope = "session" )
326332def f_broken_qpid_broker (f_find_available_port_for_broken ):
327333 LOG .debug ("starting broker" , f"localhost:{ f_find_available_port_for_broken } " )
328- broker = Container (_BrokenBroker (f"localhost:{ f_find_available_port_for_broken } " ))
329- p = Process (target = broker .run , args = ())
334+ p = Process (target = run_broken_broker , args = ())
330335 p .start ()
331- yield (broker , f_find_available_port_for_broken )
336+ yield (f_find_available_port_for_broken , )
332337 LOG .debug ("destroying qpid broker" )
333338 p .terminate ()
334339
@@ -380,8 +385,7 @@ def f_fake_msgsigner_stray(
380385@fixture
381386def f_client_certificate ():
382387 with tempfile .NamedTemporaryFile () as tmpf :
383- tmpf .write (
384- """
388+ tmpf .write ("""
385389-----BEGIN PRIVATE KEY-----
386390MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1y5rshMkYqfP2
387391k7z2IJXto3AvLCAYDN9WX5mUUFgPFAFur38bDopqj5dSkXlR5f3MwZeRCNsxRXKD
@@ -432,19 +436,15 @@ def f_client_certificate():
432436aoKJ9jBURYeYzd/Zi2RPLpjt8TYPir8vKQ==
433437-----END CERTIFICATE-----
434438
435- """ .encode (
436- "utf-8"
437- )
438- )
439+ """ .encode ("utf-8" ))
439440 tmpf .flush ()
440441 yield tmpf .name
441442
442443
443444@fixture
444445def f_ca_certificate ():
445446 with tempfile .NamedTemporaryFile () as tmpf :
446- tmpf .write (
447- """
447+ tmpf .write ("""
448448-----BEGIN CERTIFICATE-----
449449MIIDtzCCAp+gAwIBAgIUATUd1WliG6ETZqKP8EZyijG9xUIwDQYJKoZIhvcNAQEL
450450BQAwazELMAkGA1UEBhMCdVMxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEQMA4GA1UE
@@ -466,19 +466,15 @@ def f_ca_certificate():
466466tcKssr4IEdgeVNco+UStQrrIrf+KoPN147fKzwkaUZKj3ybVExHnilr4D+HB94jL
467467pH404Fud+v2NWjl7RSQnsMw+gCz6Sm3eU/aWC5L5ZOecawj01Qr60nv97eqc8tdG
468468TrXd8yRh0cI5wL5KnO4hL/kYwOOaKsMwEkNlmL2Io7DrhVgJUAWycqfHfA==
469- -----END CERTIFICATE-----""" .encode (
470- "utf-8"
471- )
472- )
469+ -----END CERTIFICATE-----""" .encode ("utf-8" ))
473470 tmpf .flush ()
474471 yield tmpf .name
475472
476473
477474@fixture
478475def f_config_msg_signer_missing ():
479476 with tempfile .NamedTemporaryFile () as tmpf :
480- tmpf .write (
481- f"""
477+ tmpf .write (f"""
482478msg_signer:
483479 messaging_brokers:
484480 - amqps://broker-01:5671
@@ -491,10 +487,7 @@ def f_config_msg_signer_missing():
491487 timeout: 1
492488 retries: 3
493489 message_id_key: request_id
494- log_level: debug""" .encode (
495- "utf-8"
496- )
497- )
490+ log_level: debug""" .encode ("utf-8" ))
498491 tmpf .flush ()
499492 yield tmpf .name
500493
0 commit comments