Add capath to tests

Author: hmstepanek

tests/agent_unittests/test_agent_protocol.py

@@ -170,7 +170,7 @@ def test_send(status_code):
     HttpClientRecorder.STATUS_CODE = status_code
     settings = finalize_application_settings(
         {
-            "request_headers_map": {"custom-header": u"value"},
+            "request_headers_map": {"custom-header": "value"},
             "agent_run_id": "RUN_TOKEN",
         }
     )
@@ -196,7 +196,7 @@ def test_send(status_code):
 
     assert request.headers == {
         "Content-Type": "application/json",
-        "custom-header": u"value",
+        "custom-header": "value",
     }
 
     assert request.payload == b"[1,2,3]"
@@ -297,7 +297,7 @@ def connect_payload_asserts(
     with_kubernetes=True,
 ):
     payload_data = payload[0]
-    assert isinstance(payload_data["agent_version"], type(u""))
+    assert isinstance(payload_data["agent_version"], type(""))
     assert payload_data["app_name"] == PAYLOAD_APP_NAME
     assert payload_data["display_host"] == DISPLAY_NAME
     assert payload_data["environment"] == ENVIRONMENT
@@ -565,6 +565,7 @@ def test_ca_bundle_path(monkeypatch, ca_bundle_path):
     # Pretend CA certificates are not available
     class DefaultVerifyPaths(object):
         cafile = None
+        capath = None
 
         def __init__(self, *args, **kwargs):
             pass

tests/agent_unittests/test_http_client.py

@@ -314,7 +314,7 @@ def test_http_payload_compression(server, client_cls, method, threshold):
         ]
         assert internal_metrics["Supportability/Python/Collector/Output/Bytes"][:2] == [
             2,
-            len(payload)*2,
+            len(payload) * 2,
         ]
 
         if threshold < 20:
@@ -324,8 +324,8 @@ def test_http_payload_compression(server, client_cls, method, threshold):
 
             # Verify the compressed payload length is recorded
             assert internal_metrics["Supportability/Python/Collector/method1/ZLIB/Bytes"][:2] == [1, payload_byte_len]
-            assert internal_metrics["Supportability/Python/Collector/ZLIB/Bytes"][:2] == [2, payload_byte_len*2]
-            
+            assert internal_metrics["Supportability/Python/Collector/ZLIB/Bytes"][:2] == [2, payload_byte_len * 2]
+
             assert len(internal_metrics) == 8
         else:
             # Verify no ZLIB compression metrics were sent
@@ -366,11 +366,14 @@ def test_cert_path(server):
 def test_default_cert_path(monkeypatch, system_certs_available):
     if system_certs_available:
         cert_file = "foo"
+        ca_path = "/usr/certs"
     else:
         cert_file = None
+        ca_path = None
 
     class DefaultVerifyPaths(object):
         cafile = cert_file
+        capath = ca_path
 
         def __init__(self, *args, **kwargs):
             pass