From 89abcd4da267665d363e558ab54ec3272d67c6e4 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Fri, 10 Jan 2020 16:04:13 -0800 Subject: more live tests (for regressions) --- python/sandcrawler/ia.py | 1 + python/tests/test_live_wayback.py | 41 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/python/sandcrawler/ia.py b/python/sandcrawler/ia.py index 096d5d4..db03a5d 100644 --- a/python/sandcrawler/ia.py +++ b/python/sandcrawler/ia.py @@ -107,6 +107,7 @@ class CdxApiClient: resp = self.http_session.get(self.host_url, params=params) if resp.status_code != 200: raise CdxApiError(resp.text) + #print(resp.url, file=sys.stderr) rj = resp.json() if len(rj) <= 1: return None diff --git a/python/tests/test_live_wayback.py b/python/tests/test_live_wayback.py index 7b9a1f2..c5376e0 100644 --- a/python/tests/test_live_wayback.py +++ b/python/tests/test_live_wayback.py @@ -52,6 +52,14 @@ def test_cdx_lookup_best(cdx_client): # won't know datetime, hash, etc assert resp.url in (url, url.replace("https://", "http://")) assert resp.mimetype == "application/pdf" + assert resp.status_code == 200 + + url = "https://americanarchivist.org/doi/abs/10.17723/aarc.62.2.gu33570g87v71007" + resp = cdx_client.lookup_best(url, best_mimetype="application/pdf") + + assert resp.url in (url, url.replace("https://", "http://")) + assert resp.mimetype == "text/html" + assert resp.status_code == 200 @pytest.mark.skip(reason="hits prod services, requires auth") def test_wayback_fetch(wayback_client): @@ -71,3 +79,36 @@ def test_lookup_resource_success(wayback_client): assert resp.terminal_url in (url, url.replace("https://", "http://")) assert resp.cdx.url in (url, url.replace("https://", "http://")) +@pytest.mark.skip(reason="hits prod services, requires auth") +def test_cdx_fetch_spn2(cdx_client): + + # https://linkinghub.elsevier.com/retrieve/pii/S2590109519300424 20200110210133 + + # com,elsevier,linkinghub)/retrieve/pii/s2590109519300424 20191201203206 https://linkinghub.elsevier.com/retrieve/pii/S2590109519300424 text/html 200 FPXVUJR7RXVGO6RIY5HYB6JVT7OD53SG - - 5026 364192270 liveweb-20191201204645/live-20191201195942-wwwb-app52.us.archive.org.warc.gz + # com,elsevier,linkinghub)/retrieve/pii/s2590109519300424 20200110210044 https://linkinghub.elsevier.com/retrieve/pii/S2590109519300424 text/html 200 OIQ3TKPBQLYYXQDIG7D2ZOK7IJEUEAQ7 - - 5130 710652442 liveweb-20200110204521-wwwb-spn20.us.archive.org-8001.warc.gz + # com,elsevier,linkinghub)/retrieve/pii/s2590109519300424 20200110210133 https://linkinghub.elsevier.com/retrieve/pii/S2590109519300424 text/html 200 G2MSFAYELECMFGKTYEHUN66WWNW4HXKQ - - 5126 544508422 liveweb-20200110205247-wwwb-spn01.us.archive.org-8000.warc.gz + + url = "https://linkinghub.elsevier.com/retrieve/pii/S2590109519300424" + datetime = "20200110210133" + resp = cdx_client.fetch(url, datetime, filter_status_code=200) + + assert resp.url == url + assert resp.datetime == datetime + assert resp.sha1b32 == "G2MSFAYELECMFGKTYEHUN66WWNW4HXKQ" + assert resp.status_code == 200 + + # https://onlinelibrary.wiley.com/doi/pdf/10.1002/lrh2.10209 20200110222410 + + #com,wiley,onlinelibrary)/doi/pdf/10.1002/lrh2.10209 20200110222410 https://onlinelibrary.wiley.com/doi/pdf/10.1002/lrh2.10209 text/html 200 VYW7JXFK6EC2KC537N5B7PHYZC4B6MZL - - 9006 815069841 liveweb-20200110214015-wwwb-spn18.us.archive.org-8002.warc.gz +#com,wiley,onlinelibrary)/doi/pdf/10.1002/lrh2.10209 20200110222410 https://onlinelibrary.wiley.com/doi/pdf/10.1002/lrh2.10209 text/html 302 AFI55BZE23HDTTEERUFKRP6WQVO3LOLS - - 1096 815066572 liveweb-20200110214015-wwwb-spn18.us.archive.org-8002.warc.gz +#com,wiley,onlinelibrary)/doi/pdf/10.1002/lrh2.10209 20200110222422 https://onlinelibrary.wiley.com/doi/pdf/10.1002/lrh2.10209 text/html 302 AFI55BZE23HDTTEERUFKRP6WQVO3LOLS - - 1094 307563475 liveweb-20200110214449-wwwb-spn18.us.archive.org-8003.warc.gz + + url = "https://onlinelibrary.wiley.com/doi/pdf/10.1002/lrh2.10209" + datetime = "20200110222410" + resp = cdx_client.fetch(url, datetime, filter_status_code=200) + + assert resp.url == url + assert resp.datetime == datetime + assert resp.sha1b32 == "VYW7JXFK6EC2KC537N5B7PHYZC4B6MZL" + assert resp.status_code == 200 + -- cgit v1.2.3