From ddf971ba0380d10891d0c5f7404ceab57ac8e55b Mon Sep 17 00:00:00 2001 From: David Glick Date: Sat, 10 Feb 2024 22:24:50 -0800 Subject: [PATCH 1/3] Fix printing the server URL in non-reload mode --- src/plone/app/robotframework/server.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/plone/app/robotframework/server.py b/src/plone/app/robotframework/server.py index 6f8205e..8059adc 100644 --- a/src/plone/app/robotframework/server.py +++ b/src/plone/app/robotframework/server.py @@ -79,16 +79,19 @@ def print_urls(zope_layer, xmlrpc_server): When doing that it is helpful that the URLs with the chosen ports are printed to stdout. """ + print("Robot XMLRPC: http://{}:{}".format(*xmlrpc_server.server_address)) + for layer in zope_layer.baseResolutionOrder: # Walk up the testing layers and look for the first zserver in order to get the # actual server name and server port. zserver = getattr(layer, "zserver", None) - if not zserver: - continue - print(f"ZSERVER: http://{zserver.server_name}:{zserver.server_port}") - break - - print("XMLRPC: http://{}:{}".format(*xmlrpc_server.server_address)) + if zserver: + print(f"Zope is running at: http://{zserver.server_name}:{zserver.server_port}/") + break + server = getattr(layer, "server", None) + if server: + print(f"Zope is running at: {server.application_url}") + break def start_reload( From 88aa6cb384199fccf56d07f96ad15071b649360c Mon Sep 17 00:00:00 2001 From: David Glick Date: Sat, 10 Feb 2024 22:28:11 -0800 Subject: [PATCH 2/3] changelog --- news/155.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/155.bugfix diff --git a/news/155.bugfix b/news/155.bugfix new file mode 100644 index 0000000..7703dcc --- /dev/null +++ b/news/155.bugfix @@ -0,0 +1 @@ +Fix printing the server URL when robot-server is run without reloading enabled. @davisagli From a0063561335cd428df488af6ab92f6ec804e93a7 Mon Sep 17 00:00:00 2001 From: David Glick Date: Sat, 10 Feb 2024 22:28:48 -0800 Subject: [PATCH 3/3] lint --- src/plone/app/robotframework/server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plone/app/robotframework/server.py b/src/plone/app/robotframework/server.py index 8059adc..a054af5 100644 --- a/src/plone/app/robotframework/server.py +++ b/src/plone/app/robotframework/server.py @@ -86,7 +86,9 @@ def print_urls(zope_layer, xmlrpc_server): # actual server name and server port. zserver = getattr(layer, "zserver", None) if zserver: - print(f"Zope is running at: http://{zserver.server_name}:{zserver.server_port}/") + print( + f"Zope is running at: http://{zserver.server_name}:{zserver.server_port}/" + ) break server = getattr(layer, "server", None) if server: