fix(tests): misc;

- More attempts...

ckanext/xloader/jobs.py

@@ -265,9 +265,8 @@ def tabulator_load():
             tmp_file.close()
         except FileNotFoundError:
             pass
-        timeout = config.get('ckanext.xloader.job_timeout', '3600')
-        logger.warning('Job timed out after %ss', timeout)
-        raise JobError('Job timed out after {}s'.format(timeout))
+        logger.warning('Job timed out after %ss', RETRIED_JOB_TIMEOUT)
+        raise JobError('Job timed out after {}s'.format(RETRIED_JOB_TIMEOUT))
     except FileCouldNotBeLoadedError as e:
         logger.warning('Loading excerpt for this format not supported.')
         logger.error('Loading file raised an error: %s', e)
@@ -389,9 +388,8 @@ def _download_resource_data(resource, data, api_key, logger):
             request_url=url, response=None)
     except JobTimeoutException as e:
         tmp_file.close()
-        timeout = config.get('ckanext.xloader.job_timeout', '3600')
-        logger.warning('Job timed out after %ss', timeout)
-        raise JobError('Job timed out after {}s'.format(timeout))
+        logger.warning('Job timed out after %ss', RETRIED_JOB_TIMEOUT)
+        raise JobError('Job timed out after {}s'.format(RETRIED_JOB_TIMEOUT))
 
     logger.info('Downloaded ok - %s', printable_file_size(length))
     file_hash = m.hexdigest()

ckanext/xloader/tests/test_jobs.py

@@ -86,8 +86,8 @@ def data(create_with_upload, apikey):
 
 
 @pytest.mark.usefixtures("clean_db", "with_plugins")
-@pytest.mark.ckan_config("ckanext.xloader.job_timeout", 15)
-@pytest.mark.ckan_config("ckan.jobs.timeout", 15)
+@pytest.mark.ckan_config("ckanext.xloader.job_timeout", 2)
+@pytest.mark.ckan_config("ckan.jobs.timeout", 2)
 class TestXLoaderJobs(helpers.FunctionalRQTestBase):
 
     def test_xloader_data_into_datastore(self, cli, data):
@@ -139,7 +139,7 @@ def test_data_max_excerpt_lines_config(self, cli, data):
 
     def test_data_with_rq_job_timeout(self, cli, data):
         file_suffix = 'multiplication_2.csv'
-        self.enqueue(jobs.xloader_data_into_datastore, [data], rq_kwargs=dict(timeout=15))
+        self.enqueue(jobs.xloader_data_into_datastore, [data], rq_kwargs=dict(timeout=2))
         with mock.patch("ckanext.xloader.jobs.get_response", get_large_data_response):
             stdout = cli.invoke(ckan, ["jobs", "worker", "--burst"]).output
             assert "Job timed out after" in stdout

test.ini

@@ -34,12 +34,12 @@ handlers = console
 
 [logger_ckan]
 qualname = ckan
-handlers =
+handlers = console
 level = INFO
 
 [logger_ckanext_xloader]
 qualname = ckanext.xloader
-handlers =
+handlers = console
 level = WARN
 
 [logger_sqlalchemy]