Skip to content

Commit 05e2b84

Browse files
rzatsrzats
committed
Refactor?
1 parent 3d8b827 commit 05e2b84

File tree

3 files changed

+22
-43
lines changed

3 files changed

+22
-43
lines changed

‎integrations/server/test_api_keys.py

+19-34
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ class APIKeysTets(DelphiTestBase):
1111
def localSetUp(self):
1212
self.role_name = "cdc"
1313

14-
def _make_request(self, url: str = None, params: dict = {}, auth: tuple = None):
15-
if not url:
16-
url = self.epidata_client.BASE_URL
14+
def _make_request(self, endpoint: str, params: dict = {}, auth: tuple = None):
15+
url = f"{self.epidata_client.BASE_URL}/{endpoint}"
1716
response = requests.get(url, params=params, auth=auth)
1817
return response
1918

@@ -22,13 +21,12 @@ def test_public_route(self):
2221
public_route = "http://delphi_web_epidata/epidata/version"
2322
status_codes = set()
2423
for _ in range(10):
25-
status_codes.add(self._make_request(public_route).status_code)
24+
status_codes.add(self._make_request("version", public_route).status_code)
2625
self.assertEqual(status_codes, {200})
2726

2827
def test_no_multiples_data_source(self):
2928
"""Test requests with no multiples and with provided `data_source` and `signal` as a separate query params."""
3029
params = {
31-
"source": "covidcast",
3230
"data_source": "fb-survey",
3331
"signal": "smoothed_wcli",
3432
"time_type": "day",
@@ -38,13 +36,12 @@ def test_no_multiples_data_source(self):
3836
}
3937
status_codes = set()
4038
for _ in range(10):
41-
status_codes.add(self._make_request(params=params).status_code)
39+
status_codes.add(self._make_request("covidcast", params=params).status_code)
4240
self.assertEqual(status_codes, {200})
4341

4442
def test_no_multiples_source_signal(self):
4543
"""Test requests with colon-delimited source-signal param presentation."""
4644
params = {
47-
"source": "covidcast",
4845
"signal": "fb-survey:smoothed_wcli",
4946
"time_type": "day",
5047
"geo_type": "state",
@@ -53,13 +50,12 @@ def test_no_multiples_source_signal(self):
5350
}
5451
status_codes = set()
5552
for _ in range(10):
56-
status_codes.add(self._make_request(params=params).status_code)
53+
status_codes.add(self._make_request("covidcast", params=params).status_code)
5754
self.assertEqual(status_codes, {200})
5855

5956
def test_multiples_allowed_signal_two_multiples(self):
6057
"""Test requests with 2 multiples and allowed dashboard signal"""
6158
params = {
62-
"source": "covidcast",
6359
"signal": "fb-survey:smoothed_wcli",
6460
"time_type": "day",
6561
"geo_type": "state",
@@ -68,13 +64,12 @@ def test_multiples_allowed_signal_two_multiples(self):
6864
}
6965
status_codes = set()
7066
for _ in range(10):
71-
status_codes.add(self._make_request(params=params).status_code)
67+
status_codes.add(self._make_request("covidcast", params=params).status_code)
7268
self.assertEqual(status_codes, {200})
7369

7470
def test_multiples_non_allowed_signal(self):
7571
"""Test requests with 2 multiples and non-allowed dashboard signal"""
7672
params = {
77-
"source": "covidcast",
7873
"signal": "hospital-admissions:smoothed_adj_covid19_from_claims",
7974
"time_type": "day",
8075
"geo_type": "state",
@@ -83,13 +78,12 @@ def test_multiples_non_allowed_signal(self):
8378
}
8479
status_codes = set()
8580
for _ in range(10):
86-
status_codes.add(self._make_request(params=params).status_code)
81+
status_codes.add(self._make_request("covidcast", params=params).status_code)
8782
self.assertEqual(status_codes, {200, 429})
8883

8984
def test_multiples_mixed_allowed_signal_two_multiples(self):
9085
"""Test requests with 2 multiples and mixed-allowed dashboard signal"""
9186
params = {
92-
"source": "covidcast",
9387
"signal": "fb-survey:smoothed_wcli,hospital-admissions:smoothed_adj_covid19_from_claims",
9488
"time_type": "day",
9589
"geo_type": "state",
@@ -98,13 +92,12 @@ def test_multiples_mixed_allowed_signal_two_multiples(self):
9892
}
9993
status_codes = set()
10094
for _ in range(10):
101-
status_codes.add(self._make_request(params=params).status_code)
95+
status_codes.add(self._make_request("covidcast", params=params).status_code)
10296
self.assertEqual(status_codes, {200, 429})
10397

10498
def test_multiples_allowed_signal_three_multiples(self):
10599
"""Test requests with 3 multiples and allowed dashboard signal"""
106100
params = {
107-
"source": "covidcast",
108101
"signal": "fb-survey:smoothed_wcli,fb-survey:smoothed_wcli",
109102
"time_type": "day",
110103
"geo_type": "state",
@@ -113,13 +106,12 @@ def test_multiples_allowed_signal_three_multiples(self):
113106
}
114107
status_codes = set()
115108
for _ in range(10):
116-
status_codes.add(self._make_request(params=params).status_code)
109+
status_codes.add(self._make_request("covidcast", params=params).status_code)
117110
self.assertEqual(status_codes, {401})
118111

119112
def test_multiples_mixed_allowed_signal_three_multiples(self):
120113
"""Test requests with 3 multiples and mixed-allowed dashboard signal"""
121114
params = {
122-
"source": "covidcast",
123115
"signal": "fb-survey:smoothed_wcli,fb-survey:smoothed_wcli1",
124116
"time_type": "day",
125117
"geo_type": "state",
@@ -128,13 +120,12 @@ def test_multiples_mixed_allowed_signal_three_multiples(self):
128120
}
129121
status_codes = set()
130122
for _ in range(10):
131-
status_codes.add(self._make_request(params=params).status_code)
123+
status_codes.add(self._make_request("covidcast", params=params).status_code)
132124
self.assertEqual(status_codes, {401})
133125

134126
def test_multiples_mixed_allowed_signal_api_key(self):
135127
"""Test requests with 3 multiples and mixed-allowed dashboard signal + valid API Key"""
136128
params = {
137-
"source": "covidcast",
138129
"signal": "fb-survey:smoothed_wcli,fb-survey:smoothed_wcli1",
139130
"time_type": "day",
140131
"geo_type": "state",
@@ -144,14 +135,13 @@ def test_multiples_mixed_allowed_signal_api_key(self):
144135
status_codes = set()
145136
for _ in range(10):
146137
status_codes.add(
147-
self._make_request(params=params, auth=self.epidata_client.auth).status_code
138+
self._make_request("covidcast", params=params, auth=self.epidata_client.auth).status_code
148139
)
149140
self.assertEqual(status_codes, {200})
150141

151142
def test_multiples_allowed_signal_api_key(self):
152143
"""Test requests with 3 multiples and allowed dashboard signal + valid API Key"""
153144
params = {
154-
"source": "covidcast",
155145
"signal": "fb-survey:smoothed_wcli,fb-survey:smoothed_wcli",
156146
"time_type": "day",
157147
"geo_type": "state",
@@ -161,14 +151,13 @@ def test_multiples_allowed_signal_api_key(self):
161151
status_codes = set()
162152
for _ in range(10):
163153
status_codes.add(
164-
self._make_request(params=params, auth=self.epidata_client.auth).status_code
154+
self._make_request("covidcast", params=params, auth=self.epidata_client.auth).status_code
165155
)
166156
self.assertEqual(status_codes, {200})
167157

168158
def test_no_multiples_allowed_signal_api_key(self):
169159
"""Test requests with no multiples and allowed dashboard signal + valid API Key"""
170160
params = {
171-
"source": "covidcast",
172161
"signal": "fb-survey:smoothed_wcli",
173162
"time_type": "day",
174163
"geo_type": "state",
@@ -178,14 +167,13 @@ def test_no_multiples_allowed_signal_api_key(self):
178167
status_codes = set()
179168
for _ in range(10):
180169
status_codes.add(
181-
self._make_request(params=params, auth=self.epidata_client.auth).status_code
170+
self._make_request("covidcast", params=params, auth=self.epidata_client.auth).status_code
182171
)
183172
self.assertEqual(status_codes, {200})
184173

185174
def test_no_multiples_allowed_signal_bad_api_key(self):
186175
"""Test requests with no multiples and allowed dashboard signal + bad API Key"""
187176
params = {
188-
"source": "covidcast",
189177
"signal": "fb-survey:smoothed_wcli",
190178
"time_type": "day",
191179
"geo_type": "state",
@@ -196,54 +184,51 @@ def test_no_multiples_allowed_signal_bad_api_key(self):
196184
for _ in range(10):
197185
status_codes.add(
198186
self._make_request(
199-
params=params, auth=("bad_key", "bad_email")
187+
"covidcast", params=params, auth=("bad_key", "bad_email")
200188
).status_code
201189
)
202190
self.assertEqual(status_codes, {200})
203191

204192
def test_restricted_endpoint_no_key(self):
205193
"""Test restricted endpoint with no auth key"""
206-
params = {"source": "cdc", "regions": "1as", "epiweeks": "202020"}
194+
params = {"regions": "1as", "epiweeks": "202020"}
207195
status_codes = set()
208196
for _ in range(10):
209-
status_codes.add(self._make_request(params=params).status_code)
197+
status_codes.add(self._make_request("cdc", params=params).status_code)
210198
self.assertEqual(status_codes, {401})
211199

212200
def test_restricted_endpoint_invalid_key(self):
213201
"""Test restricted endpoint with invalid auth key"""
214202
params = {
215-
"source": "cdc",
216203
"regions": "1as",
217204
"epiweeks": "202020",
218205
"auth": "invalid_key",
219206
}
220207
status_codes = set()
221208
for _ in range(10):
222-
status_codes.add(self._make_request(params=params).status_code)
209+
status_codes.add(self._make_request("cdc", params=params).status_code)
223210
self.assertEqual(status_codes, {401})
224211

225212
def test_restricted_endpoint_no_roles_key(self):
226213
"""Test restricted endpoint with no roles key"""
227214
params = {
228-
"source": "cdc",
229215
"regions": "1as",
230216
"epiweeks": "202020",
231217
"auth": "key",
232218
}
233219
status_codes = set()
234220
for _ in range(10):
235-
status_codes.add(self._make_request(params=params).status_code)
221+
status_codes.add(self._make_request("cdc", params=params).status_code)
236222
self.assertEqual(status_codes, {401})
237223

238224
def test_restricted_endpoint_valid_roles_key(self):
239225
"""Test restricted endpoint with valid auth key with required role"""
240226
params = {
241-
"source": "cdc",
242227
"regions": "1as",
243228
"epiweeks": "202020",
244229
"auth": "cdc_key",
245230
}
246231
status_codes = set()
247232
for _ in range(10):
248-
status_codes.add(self._make_request(params=params).status_code)
233+
status_codes.add(self._make_request("cdc", params=params).status_code)
249234
self.assertEqual(status_codes, {200})

‎integrations/server/test_signal_dashboard.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ def setUp(self) -> None:
2525
def test_signal_dashboard_coverage(self):
2626
"""Basic integration test for signal_dashboard_coverage endpoint"""
2727

28-
params = {
29-
"endpoint": "signal_dashboard_coverage",
30-
}
31-
response = self.epidata_client._request(params=params)
28+
response = self.epidata_client._request("signal_dashboard_coverage")
3229
self.assertEqual(
3330
response,
3431
{
@@ -41,10 +38,7 @@ def test_signal_dashboard_coverage(self):
4138
def test_signal_dashboard_status(self):
4239
"""Basic integration test for signal_dashboard_status endpoint"""
4340

44-
params = {
45-
"endpoint": "signal_dashboard_status",
46-
}
47-
response = self.epidata_client._request(params=params)
41+
response = self.epidata_client._request("signal_dashboard_status")
4842
self.assertEqual(
4943
response,
5044
{

‎src/common/integration_test_base_class.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def __init__(self, methodName: str = "runTest") -> None:
1919
self.create_tables_list = []
2020
self.role_name = None
2121
self.epidata_client = Epidata
22-
self.epidata_client.BASE_URL = "http://delphi_web_epidata/epidata/api.php"
22+
self.epidata_client.BASE_URL = "http://delphi_web_epidata/epidata"
2323
self.epidata_client.auth = ("epidata", "key")
2424

2525
def create_key_with_role(self, cur, role_name: str):

0 commit comments

Comments
 (0)