Skip to content

Commit abae19b

Browse files
committed
tests: lose dcor_depot dependency
1 parent 5adb745 commit abae19b

4 files changed

Lines changed: 14 additions & 20 deletions

File tree

ckanext/dc_serve/tests/test_helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
data_path = pathlib.Path(__file__).parent / "data"
1212

1313

14-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
14+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
1515
@pytest.mark.usefixtures('clean_db', 'with_request_context')
1616
@mock.patch('ckan.plugins.toolkit.enqueue_job',
1717
side_effect=synchronous_enqueue_job)

ckanext/dc_serve/tests/test_jobs.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
data_path = pathlib.Path(__file__).parent / "data"
2727

2828

29-
# We need the dcor_depot extension to make sure that the symbolic-
30-
# linking pipeline is used.
31-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
29+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
3230
@pytest.mark.usefixtures('clean_db', 'with_request_context')
3331
@mock.patch('ckan.plugins.toolkit.enqueue_job',
3432
side_effect=synchronous_enqueue_job)
@@ -69,9 +67,7 @@ def test_create_condensed_dataset_job_upload_s3(enqueue_job_mock, tmp_path):
6967
assert np.allclose(ds["deform"][0], 0.011666297)
7068

7169

72-
# We need the dcor_depot extension to make sure that the symbolic-
73-
# linking pipeline is used.
74-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
70+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
7571
@pytest.mark.ckan_config('ckanext.dc_serve.create_condensed_datasets', "false")
7672
@pytest.mark.usefixtures('clean_db', 'with_request_context')
7773
@mock.patch('ckan.plugins.toolkit.enqueue_job',
@@ -93,9 +89,7 @@ def test_do_not_create_condensed_by_config_dataset_job_upload_s3(
9389
assert not response.ok, "creating condensed resource should be disabled"
9490

9591

96-
# We need the dcor_depot extension to make sure that the symbolic-
97-
# linking pipeline is used.
98-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
92+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
9993
@pytest.mark.usefixtures('clean_db', 'with_request_context')
10094
@mock.patch('ckan.plugins.toolkit.enqueue_job',
10195
side_effect=synchronous_enqueue_job)

ckanext/dc_serve/tests/test_route.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
data_path = pathlib.Path(__file__).parent / "data"
1414

1515

16-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
16+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
1717
@pytest.mark.usefixtures('clean_db')
1818
@mock.patch('ckan.plugins.toolkit.enqueue_job',
1919
side_effect=synchronous_enqueue_job)
@@ -71,7 +71,7 @@ def test_route_redircet_condensed_to_s3_private(enqueue_job_mock, app):
7171
assert len(redirect.location) > len(redirect_stem)
7272

7373

74-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
74+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
7575
@pytest.mark.usefixtures('clean_db')
7676
@mock.patch('ckan.plugins.toolkit.enqueue_job',
7777
side_effect=synchronous_enqueue_job)
@@ -112,7 +112,7 @@ def test_route_condensed_to_s3_public(enqueue_job_mock, app):
112112
f"{rid[:3]}/{rid[3:6]}/{rid[6:]}")
113113

114114

115-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
115+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
116116
@pytest.mark.usefixtures('clean_db')
117117
@mock.patch('ckan.plugins.toolkit.enqueue_job',
118118
side_effect=synchronous_enqueue_job)

ckanext/dc_serve/tests/test_serve.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def test_api_dcserv_error(enqueue_job_mock, app):
114114
assert "Invalid query parameter 'peter'" in jres["error"]["message"]
115115

116116

117-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
117+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
118118
@pytest.mark.usefixtures('clean_db')
119119
@mock.patch('ckan.plugins.toolkit.enqueue_job',
120120
side_effect=synchronous_enqueue_job)
@@ -173,7 +173,7 @@ def test_api_dcserv_basin(enqueue_job_mock, app, tmp_path):
173173
assert basin["basin_descr"] == "an example test basin"
174174

175175

176-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
176+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
177177
@pytest.mark.usefixtures('clean_db')
178178
@mock.patch('ckan.plugins.toolkit.enqueue_job',
179179
side_effect=synchronous_enqueue_job)
@@ -272,7 +272,7 @@ def test_api_dcserv_basin_v2(enqueue_job_mock, app, tmp_path):
272272
assert bn["name"] in [f"condensed-{rid[:5]}", f"resource-{rid[:5]}"]
273273

274274

275-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
275+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
276276
@pytest.mark.usefixtures('clean_db')
277277
@mock.patch('ckan.plugins.toolkit.enqueue_job',
278278
side_effect=synchronous_enqueue_job)
@@ -326,7 +326,7 @@ def test_api_dcserv_basin_v2_public_not_signed(enqueue_job_mock, app):
326326
assert bn_cond["urls"][0] == s3cc.get_s3_url_for_artifact(rid, "condensed")
327327

328328

329-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
329+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
330330
@pytest.mark.usefixtures('clean_db')
331331
@mock.patch('ckan.plugins.toolkit.enqueue_job',
332332
side_effect=synchronous_enqueue_job)
@@ -478,7 +478,7 @@ def test_api_dcserv_metadata(enqueue_job_mock, app):
478478
assert jres["result"]["setup"]["channel width"] == 20
479479

480480

481-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
481+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
482482
@pytest.mark.usefixtures('clean_db')
483483
@mock.patch('ckan.plugins.toolkit.enqueue_job',
484484
side_effect=synchronous_enqueue_job)
@@ -547,7 +547,7 @@ def test_api_dcserv_tables(enqueue_job_mock, app):
547547
assert "brightness" in names
548548

549549

550-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
550+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
551551
@pytest.mark.usefixtures('clean_db')
552552
@mock.patch('ckan.plugins.toolkit.enqueue_job',
553553
side_effect=synchronous_enqueue_job)
@@ -582,7 +582,7 @@ def test_api_dcserv_trace_list(enqueue_job_mock, app):
582582
assert key in jres["result"]
583583

584584

585-
@pytest.mark.ckan_config('ckan.plugins', 'dcor_depot dcor_schemas dc_serve')
585+
@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas dc_serve')
586586
@pytest.mark.usefixtures('clean_db')
587587
@mock.patch('ckan.plugins.toolkit.enqueue_job',
588588
side_effect=synchronous_enqueue_job)

0 commit comments

Comments
 (0)