Unverified Commit a19e4eb0 authored by mvdbeek's avatar mvdbeek
Browse files

Lower pulsar transport_timeout param instead of extending wait

parent 4421f434

test/integration/resubmission_pulsar_job_conf.xml

+4 −2
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ 
<job_conf>

    <plugins>

        <plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>

        <plugin id="pulsar_rest" type="runner" load="galaxy.jobs.runners.pulsar:PulsarRESTJobRunner"/>

        <plugin id="pulsar_rest" type="runner" load="galaxy.jobs.runners.pulsar:PulsarRESTJobRunner">

            <param id="transport_timeout">10</param>

        </plugin>

    </plugins>



    <destinations default="initial_pulsar">

test/integration/test_job_resubmission.py

+0 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ JOB_RESUBMISSION_PULSAR_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "resubm 


class _BaseResubmissionIntegrationTestCase(integration_util.IntegrationTestCase):

    framework_tool_and_types = True

    maxseconds = 60



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

        resource_parameters = resource_parameters or {}
@@ -272,10 +271,6 @@ class TestJobResubmissionToolDetectedErrorResubmitsIntegration(_BaseResubmission 


# Verify that a failure to connect to pulsar can trigger a resubmit

class TestJobResubmissionPulsarIntegration(_BaseResubmissionIntegrationTestCase):



    # It takes a little longer to hit the timeout error for pulsar connections

    maxseconds = 120



    @classmethod

    def handle_galaxy_config_kwds(cls, config):

        super().handle_galaxy_config_kwds(config)