WS-641: CARTA 2.0

Changes

carta_envoy

• Updated CARTA command and CARTA path to use appropriate settings for new CARTA 2.0 AppImage

Testing

• Tested on dev
• Updated unit tests

Completes WS-641

apps/cli/executables/pexable/carta_envoy/test/test_connect.py

@@ -3,12 +3,18 @@ Tests for carta_envoy.connect
 """
 from unittest.mock import patch
 
-# pylint: disable=E0401, C0103, C0301, C0415, E1101, E1120, R0201, R0903, W0621
-
 import pytest
-from carta_envoy.connect import ArchiveConnect, NotificationConnect, RedisConnect, WorkflowConnect
+from carta_envoy.connect import (
+    ArchiveConnect,
+    NotificationConnect,
+    RedisConnect,
+    WorkflowConnect,
+)
 from carta_envoy.utilities import generate_random_str
 
+# pylint: disable=E0401, C0103, C0301, C0415, E1101, E1120, R0201, R0903, W0621
+
+
 test_settings = {
     "timeout": 1,
     "carta_path": "/fake/path/to/nowhere",
@@ -31,6 +37,7 @@ workflow_connect = WorkflowConnect(settings=test_settings)
 
 CARTA_POST = "carta_envoy.connect.requests.post"
 
+
 @pytest.fixture
 def redis():
     """
@@ -57,10 +64,10 @@ class TestRedisConnect:
     @pytest.mark.skip("not yet implemented")
     def test_generate_url(self):
         """
-       TODO
+        TODO
 
-       :return:
-       """
+        :return:
+        """
 
     def test_get_available_port(self):
         """
@@ -81,8 +88,8 @@ class TestRedisConnect:
         """
         TODO
 
-      :return:
-      """
+        :return:
+        """
 
     def test_connect_to_redis_error(self):
         """
@@ -98,8 +105,8 @@ class TestRedisConnect:
         Tests that filled out Redis values are given correctly
         """
         random_id = generate_random_str()
-        front_end_port = 7777
-        back_end_port = 6464
+        session_port = 7777
+        wrapper_port = 6464
         reverse_proxy_host = "test"
         front_end = f"carta-front-{random_id}"
         back_end = f"carta-back-{random_id}"
@@ -117,7 +124,7 @@ class TestRedisConnect:
         assert (
             value
             in redis_connect.get_redis_values(
-                reverse_proxy_host, random_id, random_id, front_end_port, back_end_port
+                reverse_proxy_host, random_id, random_id, session_port, wrapper_port
             ).keys()
             for value in values
         )
@@ -129,17 +136,13 @@ class TestRedisConnect:
         :param redis: Custom fixture that provides a sandbox Redis server
         """
         redis_connect.conn = redis
-        redis_connect.generated_ids = {
-            "front_end_id": "1234abcd",
-            "back_end_id": "5678efgh",
-            "wrapper_id": "9876jklm",
-        }
+        redis_connect.generated_ids = {"session_id": "5678efgh", "wrapper_id": "9876jklm"}
         redis.set("duplicate", "value")
         with patch("carta_envoy.connect.RedisConnect.get_redis_values") as values:
-            redis_connect.check_for_duplicate_values({"duplicate": "value"}, 9897, 6543, 1234)
+            redis_connect.check_for_duplicate_values({"duplicate": "value"}, 9897, 6543)
             assert values.call_count == 1
             values.call_count = 0
-            redis_connect.check_for_duplicate_values({"not_duplicate": "value"}, 9897, 6543, 1234)
+            redis_connect.check_for_duplicate_values({"not_duplicate": "value"}, 9897, 6543)
             assert values.call_count == 0