Improve and add missing tests for Private Image Sharing feature

Author: psnoch-akamai

tests/integration/helpers.py

@@ -210,6 +210,6 @@ def get_random_region_with_caps(
 
 
 def assert_help_actions_list(expected_actions, help_output):
-    output_actions = re.findall("\│\s(\S+)\s*\│", help_output)
+    output_actions = re.findall("\│\s(\S+(?:,\s)?\S+)\s*\│", help_output)
     for expected_action in expected_actions:
         assert expected_action in output_actions

tests/integration/sharegroups/fixtures.py

@@ -3,7 +3,8 @@
 
 from tests.integration.helpers import (
     BASE_CMDS,
-    exec_test_command, get_random_text,
+    exec_test_command,
+    get_random_text,
 )
 
 
@@ -16,6 +17,23 @@ def get_region():
     yield first_id
 
 
+def wait_for_image_status(id, expected_status, timeout=180, interval=5):
+    import time
+
+    current_status = exec_test_command(
+        BASE_CMDS["images"] + ["view", id, "--text", "--no-headers", "--delimiter", ",", "--format", "status"]
+    ).splitlines()
+    timer = 0
+    while current_status[0] != expected_status and timer < timeout:
+        time.sleep(interval)
+        timer += interval
+        current_status = exec_test_command(
+            BASE_CMDS["images"] + ["view", id, "--text", "--no-headers", "--delimiter", ",", "--format", "status"]
+        ).splitlines()
+    if timer >= timeout:
+            raise TimeoutError(f"Created image did not reach status '{expected_status}' within {timeout} seconds.")
+
+
 @pytest.fixture(scope="function")
 def create_image_id(get_region):
     linode_id = exec_test_command(
@@ -30,7 +48,7 @@ def create_image_id(get_region):
         BASE_CMDS["images"] + ["create", "--label", "linode-cli-test-image-sharing-image", "--disk_id", disks[0],
                                "--text", "--no-headers", "--delimiter", ",", "--format", "id"]
     )
-    # TODO: wait_for_status
+    wait_for_image_status(image_id, "available")
     yield linode_id, image_id
 
 
@@ -42,13 +60,3 @@ def create_share_group():
                                           "--format", "id,uuid"]
     ).split(",")
     yield share_group[0], share_group[1]
-
-
-@pytest.fixture(scope="function")
-def create_token():
-    label = get_random_text(8) + "_sharegroup_cli_test"
-    created_token = exec_test_command(
-        BASE_CMDS["profile"] + ["token-create", "--label", label, "--text", "--no-headers", "--delimiter", ",",
-                                "--format", "token"]
-    )
-    yield jwt.encode({"some": "payload"}, created_token, algorithm="HS256")