|
21 | 21 | }
|
22 | 22 |
|
23 | 23 |
|
24 |
| -def doi_resolver(req, context): |
25 |
| - resp = doi_responses.get(req.url) |
26 |
| - # doi responses are redirects |
27 |
| - if resp is not None: |
28 |
| - context.status_code = 302 |
29 |
| - context.headers["Location"] = resp |
30 |
| - return resp |
31 |
| - |
32 |
| - |
33 |
| -def test_content_id(requests_mock): |
34 |
| - requests_mock.get(re.compile("https://"), json=doi_resolver) |
35 |
| - |
| 24 | +def test_content_id(): |
36 | 25 | zen = Zenodo()
|
37 | 26 | zen.detect("10.5281/zenodo.3232985")
|
38 | 27 | assert zen.content_id == "3232985"
|
@@ -60,15 +49,11 @@ def test_content_id(requests_mock):
|
60 | 49 |
|
61 | 50 |
|
62 | 51 | @pytest.mark.parametrize("test_input,expected", test_hosts)
|
63 |
| -def test_detect_zenodo(test_input, expected, requests_mock): |
64 |
| - requests_mock.get(re.compile("https://"), json=doi_resolver) |
| 52 | +def test_detect_zenodo(test_input, expected): |
65 | 53 | # valid Zenodo DOIs trigger this content provider
|
66 | 54 | assert Zenodo().detect(test_input[0]) == expected
|
67 | 55 | assert Zenodo().detect(test_input[1]) == expected
|
68 | 56 | assert Zenodo().detect(test_input[2]) == expected
|
69 |
| - # only two of the three calls above have to resolve a DOI (2 req per doi resolution) |
70 |
| - assert requests_mock.call_count == 4 |
71 |
| - requests_mock.reset_mock() |
72 | 57 |
|
73 | 58 | # Don't trigger the Zenodo content provider
|
74 | 59 | assert Zenodo().detect("/some/path/here") is None
|
|
0 commit comments