Unverified Commit 4421f434 authored by Nicola Soranzo's avatar Nicola Soranzo Committed by mvdbeek
Browse files

Store maxseconds on GalaxyTestDriver

parent 02d389f8

lib/galaxy_test/driver/driver_util.py

+2 −1
Original line number Diff line number Diff line
@@ -863,6 +863,7 @@ class GalaxyTestDriver(TestDriver): 
        self.allow_tool_conf_override = allow_tool_conf_override

        self.default_tool_conf = default_tool_conf

        self.datatypes_conf_override = datatypes_conf_override

        self.maxseconds = getattr(config_object, "maxseconds", DEFAULT_TOOL_TEST_WAIT)



    def setup(self, config_object=None):

        """Setup a Galaxy server for functional test (if needed).
@@ -965,7 +966,7 @@ class GalaxyTestDriver(TestDriver): 
        # Cut down default timeout to 60 seconds within tests run via

        # GalaxyTestDriver. Does not affect tests run via galaxy-tool-util,

        # which use a much longer timeout.

        maxseconds = kwd.pop("maxseconds", DEFAULT_TOOL_TEST_WAIT)

        maxseconds = kwd.pop("maxseconds", self.maxseconds)

        verify_tool(

            tool_id=tool_id,

            test_index=index,

test/integration/test_job_resubmission.py

+2 −6
Original line number Diff line number Diff line
@@ -31,17 +31,13 @@ class _BaseResubmissionIntegrationTestCase(integration_util.IntegrationTestCase) 


    def _assert_job_passes(self, tool_id="exit_code_oom", resource_parameters=None, history_id=None):

        resource_parameters = resource_parameters or {}

        self._run_tool_test(

            tool_id, resource_parameters=resource_parameters, test_history=history_id, maxseconds=self.maxseconds

        )

        self._run_tool_test(tool_id, resource_parameters=resource_parameters, test_history=history_id)



    def _assert_job_fails(self, tool_id="exit_code_oom", resource_parameters=None, history_id=None):

        resource_parameters = resource_parameters or {}

        exception_thrown = False

        try:

            self._run_tool_test(

                tool_id, resource_parameters=resource_parameters, test_history=history_id, maxseconds=self.maxseconds

            )

            self._run_tool_test(tool_id, resource_parameters=resource_parameters, test_history=history_id)

        except Exception:

            exception_thrown = True