From e1eef06243bf7d042c4a7ddd1c5c4d4d8096cf51 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 6 May 2021 14:34:40 +0200
Subject: [PATCH] Make guest_ports more reliable

---
 lib/galaxy/jobs/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py
index ff47ad0ad0f..1aae91bd45e 100644
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -1174,10 +1174,13 @@ class JobWrapper(HasResourceParameters):
     @property
     def guest_ports(self):
         if hasattr(self, "interactivetools"):
+            # This works when the job is being prepared
             guest_ports = [ep.get('port') for ep in self.interactivetools]
             return guest_ports
         else:
-            return []
+            # This works when handling a running job
+            job = self._load_job()
+            return [ep.tool_port for ep in job.interactivetool_entry_points]
 
     @property
     def working_directory(self):