Final adjustments

Author: dmytrotsko

integrations/acquisition/covidcast/test_covidcast_meta_caching.py

@@ -3,9 +3,6 @@
 # standard library
 import json
 
-# third party
-import requests
-
 # first party
 from delphi_utils import Nans
 from delphi.epidata.common.covidcast_test_base import CovidcastTestBase
@@ -17,21 +14,10 @@
   'covidcast_meta_cache_updater'
 )
 
-# use the local instance of the Epidata API
-BASE_URL = 'http://delphi_web_epidata/epidata'
-AUTH = ("epidata", "key")
-
 
 class CovidcastMetaCacheTests(CovidcastTestBase):
   """Tests covidcast metadata caching."""
 
-  @staticmethod
-  def _make_request():
-    params = {'cached': 'true'}
-    response = requests.get(f"{BASE_URL}/covidcast_meta", params=params, auth=AUTH)
-    response.raise_for_status()
-    return response.json()
-
   def test_caching(self):
     """Populate, query, cache, query, and verify the cache."""
 
@@ -110,7 +96,7 @@ def test_caching(self):
     self._db._connection.commit()
 
     # fetch the cached version (manually)
-    epidata4 = self._make_request()
+    epidata4 = self._make_request(endpoint="covidcast_meta", json=True, params={'cached': 'true'}, auth=self.epidata_client.auth, raise_for_status=True)
 
     # make sure the cache was actually served
     self.assertEqual(epidata4, {
@@ -130,7 +116,7 @@ def test_caching(self):
     self._db._connection.commit()
 
     # fetch the cached version (manually)
-    epidata5 = self._make_request()
+    epidata5 = self._make_request(endpoint="covidcast_meta", json=True, params={'cached': 'true'}, auth=self.epidata_client.auth, raise_for_status=True)
 
     # make sure the cache was returned anyhow
     self.assertEqual(epidata4, epidata5)

integrations/server/test_api_keys.py

@@ -1,6 +1,4 @@
 """Integration tests for the API Keys"""
-import requests
-
 # first party
 from delphi.epidata.common.delphi_test_base import DelphiTestBase
 
@@ -11,12 +9,6 @@ class APIKeysTets(DelphiTestBase):
     def localSetUp(self):
         self.role_name = "cdc"
 
-    def _make_request(self, url: str = None, endpoint: str = None, params: dict = {}, auth: tuple = None):
-        if not url:
-            url = self.epidata_client.BASE_URL
-        response = requests.get(f"{url}/{endpoint}", params=params, auth=auth)
-        return response
-
     def test_public_route(self):
         """Test public route"""
         status_codes = set()
@@ -36,7 +28,7 @@ def test_no_multiples_data_source(self):
         }
         status_codes = set()
         for _ in range(10):
-            status_codes.add(self._make_request(params=params, endpoint="covidcast").status_code)
+            status_codes.add(self._make_request(params=params).status_code)
         self.assertEqual(status_codes, {200})
 
     def test_no_multiples_source_signal(self):
@@ -50,7 +42,7 @@ def test_no_multiples_source_signal(self):
         }
         status_codes = set()
         for _ in range(10):
-            status_codes.add(self._make_request(params=params, endpoint="covidcast").status_code)
+            status_codes.add(self._make_request(params=params).status_code)
         self.assertEqual(status_codes, {200})
 
     def test_multiples_allowed_signal_two_multiples(self):
@@ -64,7 +56,7 @@ def test_multiples_allowed_signal_two_multiples(self):
         }
         status_codes = set()
         for _ in range(10):
-            status_codes.add(self._make_request(params=params, endpoint="covidcast").status_code)
+            status_codes.add(self._make_request(params=params).status_code)
         self.assertEqual(status_codes, {200})
 
     def test_multiples_non_allowed_signal(self):
@@ -78,7 +70,7 @@ def test_multiples_non_allowed_signal(self):
         }
         status_codes = set()
         for _ in range(10):
-            status_codes.add(self._make_request(params=params, endpoint="covidcast").status_code)
+            status_codes.add(self._make_request(params=params).status_code)
         self.assertEqual(status_codes, {200, 429})
 
     def test_multiples_mixed_allowed_signal_two_multiples(self):
@@ -92,7 +84,7 @@ def test_multiples_mixed_allowed_signal_two_multiples(self):
         }
         status_codes = set()
         for _ in range(10):
-            status_codes.add(self._make_request(params=params, endpoint="covidcast").status_code)
+            status_codes.add(self._make_request(params=params).status_code)
         self.assertEqual(status_codes, {200, 429})
 
     def test_multiples_allowed_signal_three_multiples(self):
@@ -106,7 +98,7 @@ def test_multiples_allowed_signal_three_multiples(self):
         }
         status_codes = set()
         for _ in range(10):
-            status_codes.add(self._make_request(params=params, endpoint="covidcast").status_code)
+            status_codes.add(self._make_request(params=params).status_code)
         self.assertEqual(status_codes, {401})
 
     def test_multiples_mixed_allowed_signal_three_multiples(self):
@@ -120,7 +112,7 @@ def test_multiples_mixed_allowed_signal_three_multiples(self):
         }
         status_codes = set()
         for _ in range(10):
-            status_codes.add(self._make_request(params=params, endpoint="covidcast").status_code)
+            status_codes.add(self._make_request(params=params).status_code)
         self.assertEqual(status_codes, {401})
 
     def test_multiples_mixed_allowed_signal_api_key(self):
@@ -135,7 +127,7 @@ def test_multiples_mixed_allowed_signal_api_key(self):
         status_codes = set()
         for _ in range(10):
             status_codes.add(
-                self._make_request(params=params, auth=self.epidata_client.auth, endpoint="covidcast").status_code
+                self._make_request(params=params, auth=self.epidata_client.auth).status_code
             )
         self.assertEqual(status_codes, {200})
 
@@ -151,7 +143,7 @@ def test_multiples_allowed_signal_api_key(self):
         status_codes = set()
         for _ in range(10):
             status_codes.add(
-                self._make_request(params=params, auth=self.epidata_client.auth, endpoint="covidcast").status_code
+                self._make_request(params=params, auth=self.epidata_client.auth).status_code
             )
         self.assertEqual(status_codes, {200})
 
@@ -167,7 +159,7 @@ def test_no_multiples_allowed_signal_api_key(self):
         status_codes = set()
         for _ in range(10):
             status_codes.add(
-                self._make_request(params=params, auth=self.epidata_client.auth, endpoint="covidcast").status_code
+                self._make_request(params=params, auth=self.epidata_client.auth).status_code
             )
         self.assertEqual(status_codes, {200})
 
@@ -184,7 +176,7 @@ def test_no_multiples_allowed_signal_bad_api_key(self):
         for _ in range(10):
             status_codes.add(
                 self._make_request(
-                    params=params, auth=("bad_key", "bad_email"), endpoint="covidcast"
+                    params=params, auth=("bad_key", "bad_email")
                 ).status_code
             )
         self.assertEqual(status_codes, {200})