tests: do not use request context

Author: paulmueller

ckanext/dc_serve/tests/test_helpers.py

@@ -12,7 +12,7 @@
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_get_dc_instance_s3(enqueue_job_mock):

ckanext/dc_serve/tests/test_jobs.py

@@ -29,7 +29,7 @@
 # We need the dcor_depot extension to make sure that the symbolic-
 # linking pipeline is used.
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_create_condensed_dataset_job_upload_s3(enqueue_job_mock, tmp_path):
@@ -73,7 +73,7 @@ def test_create_condensed_dataset_job_upload_s3(enqueue_job_mock, tmp_path):
 # linking pipeline is used.
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
 @pytest.mark.ckan_config('ckanext.dc_serve.create_condensed_datasets', "false")
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_do_not_create_condensed_by_config_dataset_job_upload_s3(
@@ -96,7 +96,7 @@ def test_do_not_create_condensed_by_config_dataset_job_upload_s3(
 # We need the dcor_depot extension to make sure that the symbolic-
 # linking pipeline is used.
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_upload_condensed_dataset_to_s3_job_and_verify_basin(

ckanext/dc_serve/tests/test_serve.py

@@ -19,7 +19,7 @@
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 def test_auth_forbidden(app):
     user2 = factories.UserWithToken()
 
@@ -43,7 +43,7 @@ def test_auth_forbidden(app):
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_api_dcserv_error(enqueue_job_mock, app):
@@ -114,7 +114,7 @@ def test_api_dcserv_error(enqueue_job_mock, app):
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_api_dcserv_basin(enqueue_job_mock, app, tmp_path):
@@ -173,7 +173,7 @@ def test_api_dcserv_basin(enqueue_job_mock, app, tmp_path):
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_api_dcserv_basin_v2(enqueue_job_mock, app, tmp_path):
@@ -271,7 +271,7 @@ def test_api_dcserv_basin_v2(enqueue_job_mock, app, tmp_path):
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_api_dcserv_feature_list(enqueue_job_mock, app):
@@ -304,7 +304,7 @@ def test_api_dcserv_feature_list(enqueue_job_mock, app):
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_api_dcserv_logs(enqueue_job_mock, app):
@@ -337,7 +337,7 @@ def test_api_dcserv_logs(enqueue_job_mock, app):
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_api_dcserv_metadata(enqueue_job_mock, app):
@@ -371,7 +371,7 @@ def test_api_dcserv_metadata(enqueue_job_mock, app):
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_api_dcserv_size(enqueue_job_mock, app):
@@ -405,7 +405,7 @@ def test_api_dcserv_size(enqueue_job_mock, app):
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_api_dcserv_tables(enqueue_job_mock, app):
@@ -440,7 +440,7 @@ def test_api_dcserv_tables(enqueue_job_mock, app):
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_api_dcserv_trace_list(enqueue_job_mock, app):
@@ -475,7 +475,7 @@ def test_api_dcserv_trace_list(enqueue_job_mock, app):
 
 
 @pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
-@pytest.mark.usefixtures('clean_db', 'with_request_context')
+@pytest.mark.usefixtures('clean_db')
 @mock.patch('ckan.plugins.toolkit.enqueue_job',
             side_effect=synchronous_enqueue_job)
 def test_api_dcserv_valid(enqueue_job_mock, app):