Commit 3a06fc5c authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Add actual timeout to wait_for_results

parent 7136773e

src/nova/galaxy/job.py

+2 −2
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ class Job: 
        self.status.state = WorkState.ERROR

        return self.galaxy_instance.jobs.cancel_job(self.id)



    def wait_for_results(self) -> None:

    def wait_for_results(self, timeout: int = 12000) -> None:

        """Wait for job to finish."""

        self.galaxy_instance.jobs.wait_for_job(self.id)

        self.galaxy_instance.jobs.wait_for_job(self.id, maxwait=timeout)



    def get_state(self) -> JobStatus:

        """Returns current state of job."""

src/nova/galaxy/tool.py

+3 −2
Original line number Diff line number Diff line
@@ -130,12 +130,13 @@ class Tool(AbstractWork): 
            return self._job.get_results()

        return None



    def wait_for_results(self, max_tries: int = 100) -> None:

    def wait_for_results(self, timeout: int = 12000) -> None:

        if self._job:

            timer = 0

            max_tries = 100

            while timer < max_tries:

                try:

                    self._job.wait_for_results()

                    self._job.wait_for_results(timeout)

                    return

                except Exception:

                    timer += 1