Skip to content

Commit 8ee6e89

Browse files
committed
Update EnigmaReader Tests
1 parent fd0336f commit 8ee6e89

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

pandas_datareader/enigma.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self,
3838
dataset_id=None,
3939
api_key=None,
4040
retry_count=5,
41-
pause=0.5,
41+
pause=.75,
4242
session=None):
4343

4444
super(EnigmaReader, self).__init__(symbols=[],
@@ -99,9 +99,9 @@ def _get(self, url):
9999
else:
100100
raise e
101101

102-
def get_current_snapshot_id(self):
102+
def get_current_snapshot_id(self, dataset_id):
103103
"""Get ID of the most current snapshot of a dataset"""
104-
dataset_metadata = self.get_dataset_metadata()
104+
dataset_metadata = self.get_dataset_metadata(dataset_id)
105105
return dataset_metadata['current_snapshot']['id']
106106

107107
def get_dataset_metadata(self, dataset_id):

pandas_datareader/tests/test_enigma.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,40 @@
1111
@pytest.mark.skipif(TEST_API_KEY is None, reason="no enigma_api_key")
1212
class TestEnigma(object):
1313

14+
@property
15+
def dataset_id():
16+
"""
17+
USDA Food Recall Archive
18+
Selected for being a relatively small dataset.
19+
https://public.enigma.com/datasets/292129b0-1275-44c8-a6a3-2a0881f24fe1
20+
"""
21+
return "292129b0-1275-44c8-a6a3-2a0881f24fe1"
22+
1423
@classmethod
1524
def setup_class(cls):
1625
pytest.importorskip("lxml")
1726

1827
def test_enigma_datareader(self):
1928
try:
20-
df = web.DataReader('enigma.inspections.restaurants.fl',
29+
df = web.DataReader(self.dataset_id,
2130
'enigma', access_key=TEST_API_KEY)
22-
assert 'serialid' in df.columns
31+
assert 'case_number' in df.columns
2332
except HTTPError as e:
2433
pytest.skip(e)
2534

2635
def test_enigma_get_data_enigma(self):
2736
try:
28-
df = pdr.get_data_enigma(
29-
'enigma.inspections.restaurants.fl', TEST_API_KEY)
30-
assert 'serialid' in df.columns
37+
df = pdr.get_data_enigma(self.dataset_id, TEST_API_KEY)
38+
assert 'case_number' in df.columns
3139
except HTTPError as e:
3240
pytest.skip(e)
3341

3442
def test_bad_key(self):
3543
with pytest.raises(HTTPError):
36-
web.DataReader('enigma.inspections.restaurants.fl',
44+
web.DataReader(self.dataset_id,
3745
'enigma', access_key=TEST_API_KEY + 'xxx')
3846

39-
def test_bad_url(self):
47+
def test_bad_dataset_id(self):
4048
with pytest.raises(HTTPError):
41-
web.DataReader('enigma.inspections.restaurants.fllzzy',
49+
web.DataReader('zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzz',
4250
'enigma', access_key=TEST_API_KEY)

0 commit comments

Comments
 (0)