Eliminate uses of requests library test/integration_test.py (#7633)

Author: achave11-ucsc

test/integration_test.py

@@ -70,7 +70,6 @@
     validate,
 )
 import opensearchpy
-import requests
 import urllib3
 
 from azul import (
@@ -111,8 +110,10 @@
     ESClientFactory,
 )
 from azul.http import (
+    HasCachedHttpClient,
     HttpClient,
     http_client,
+    raise_on_status,
 )
 from azul.indexer import (
     Prefix,
@@ -388,7 +389,7 @@ class IndexingIntegrationTest(IntegrationTestCase):
 
     def setUp(self) -> None:
         super().setUp()
-        self._plain_http = http_client(log)
+        self._plain_http = self._http_client
         self._http = self._plain_http
 
     @contextmanager
@@ -1839,7 +1840,7 @@ def test_azul_client_error_handling(self):
         self.assertEqual({expected}, cm.exception.args[1])
 
 
-class OpenAPIIntegrationTest(AzulTestCase):
+class OpenAPIIntegrationTest(AzulTestCase, HasCachedHttpClient):
 
     def test_openapi(self):
         for component, url in [
@@ -1848,14 +1849,14 @@ def test_openapi(self):
         ]:
             with self.subTest(component=component):
                 url.set(path='/')
-                response = requests.get(str(url))
-                self.assertEqual(response.status_code, 200)
+                response = self._http_client.urlopen('GET', str(url))
+                self.assertEqual(response.status, 200)
                 self.assertEqual(response.headers['content-type'], 'text/html')
-                self.assertGreater(len(response.content), 0)
+                self.assertGreater(len(response.data), 0)
                 # validate OpenAPI spec
                 url.set(path='/openapi.json')
-                response = requests.get(str(url))
-                response.raise_for_status()
+                response = self._http_client.urlopen('GET', str(url))
+                raise_on_status(response)
                 spec = response.json()
                 validate(spec)
 
@@ -1886,21 +1887,21 @@ def tearDownClass(cls) -> None:
         super().tearDownClass()
 
     def test_local_chalice(self):
-        response = requests.get(str(self.url))
-        self.assertEqual(200, response.status_code)
+        response = self.http_client.urlopen('GET', str(self.url))
+        self.assertEqual(200, response.status)
 
     def test_local_chalice_health_endpoint(self):
         url = str(self.url.copy().set(path='health'))
-        response = requests.get(url)
-        self.assertEqual(200, response.status_code)
+        response = self.http_client.urlopen('GET', url)
+        self.assertEqual(200, response.status)
 
     catalog = first(config.integration_test_catalogs)
 
     def test_local_chalice_index_endpoints(self):
         url = str(self.url.copy().set(path='repository/sources',
                                       query=dict(catalog=self.catalog)))
-        response = requests.get(url)
-        self.assertEqual(200, response.status_code, response.content)
+        response = self.http_client.urlopen('GET', url)
+        self.assertEqual(200, response.status, response.data)
 
     def test_local_filtered_index_endpoints(self):
         if config.is_hca_enabled(self.catalog):
@@ -1913,11 +1914,11 @@ def test_local_filtered_index_endpoints(self):
         url = str(self.url.copy().set(path='index/files',
                                       query=dict(filters=json.dumps(filters),
                                                  catalog=self.catalog)))
-        response = requests.get(url)
-        self.assertEqual(200, response.status_code, response.content)
+        response = self.http_client.urlopen('GET', url)
+        self.assertEqual(200, response.status, response.data)
 
 
-class CanBundleScriptIntegrationTest(IntegrationTestCase):
+class CanBundleScriptIntegrationTest(IntegrationTestCase, HasCachedHttpClient):
 
     def _test_catalog(self, catalog: config.Catalog):
         fqid = self.bundle_fqid(catalog.name)
@@ -2056,8 +2057,8 @@ def test_version(self):
             ('indexer', config.indexer_endpoint)
         ]:
             endpoint.set(path='/version')
-            response = requests.get(str(endpoint))
-            self.assertEqual(response.status_code, 200)
+            response = self._http_client.urlopen('GET', str(endpoint))
+            self.assertEqual(response.status, 200)
             lambda_status = response.json()['git']
             self.assertEqual(local_status, lambda_status)
 
@@ -2077,7 +2078,7 @@ def test(self):
                 es.indices.delete(index=[index_name])
 
 
-class ResponseHeadersTest(AzulTestCase):
+class ResponseHeadersTest(AzulTestCase, HasCachedHttpClient):
 
     def test_response_security_headers(self):
         no_cache = 'no-store'
@@ -2093,8 +2094,8 @@ def test_response_security_headers(self):
         for endpoint in (config.service_endpoint, config.indexer_endpoint):
             for path, cache_control in test_cases.items():
                 with self.subTest(endpoint=endpoint, path=path):
-                    response = requests.get(str(endpoint / path))
-                    response.raise_for_status()
+                    response = self.http_client.urlopen('GET', str(endpoint / path))
+                    raise_on_status(response)
                     actual_csp = response.headers['Content-Security-Policy']
                     parsed_csp = CSP.parse(actual_csp)
                     parsed_csp.validate()
@@ -2123,7 +2124,7 @@ def test_response_security_headers(self):
     def test_default_4xx_response_headers(self):
         for endpoint in (config.service_endpoint, config.indexer_endpoint):
             with self.subTest(endpoint=endpoint):
-                response = requests.get(str(endpoint / 'does-not-exist'))
-                self.assertEqual(403, response.status_code)
+                response = self.http_client.urlopen('GET', str(endpoint / 'does-not-exist'))
+                self.assertEqual(403, response.status)
                 self.assertIsSubset(AzulChaliceApp.security_headers().items(),
                                     response.headers.items())