From 89fc86e3e50149f5ee5614c5e4930c094ca3f42d Mon Sep 17 00:00:00 2001
From: Youjung Kim <126618609+ykim-akamai@users.noreply.github.com>
Date: Wed, 20 Nov 2024 09:39:14 -0800
Subject: [PATCH] test: Update SSH and VLAN test cases (#682)

---
 tests/integration/linodes/test_disk.py   | 12 ++++--------
 tests/integration/ssh/test_plugin_ssh.py |  5 +++--
 tests/integration/vlans/test_vlans.py    |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/integration/linodes/test_disk.py b/tests/integration/linodes/test_disk.py
index eaca689fa..3dff48a09 100644
--- a/tests/integration/linodes/test_disk.py
+++ b/tests/integration/linodes/test_disk.py
@@ -96,8 +96,7 @@ def disk_poll_func():
         .rstrip()
     )
 
-    # #TODO:: Add "disk_encryption" when spec shows the header
-    headers = ["id", "label", "status", "size", "filesystem"]
+    headers = ["id", "label", "status", "size", "filesystem", "disk_encryption"]
 
     assert_headers_in_lines(headers, res.splitlines())
 
@@ -126,8 +125,7 @@ def disk_poll_func():
         .rstrip()
     )
 
-    # TODO:: Add "disk_encryption" when spec shows the header
-    headers = ["id", "label", "status", "size", "filesystem"]
+    headers = ["id", "label", "status", "size", "filesystem", "disk_encryption"]
 
     assert_headers_in_lines(headers, res.splitlines())
 
@@ -183,8 +181,7 @@ def test_disk_update(linode_instance_disk_tests):
         .rstrip()
     )
 
-    # TODO:: Add "disk_encryption" when spec shows the header
-    headers = ["id", "label", "status", "size", "filesystem"]
+    headers = ["id", "label", "status", "size", "filesystem", "disk_encryption"]
 
     assert_headers_in_lines(headers, res.splitlines())
     assert update_label in res
@@ -208,7 +205,6 @@ def test_disks_list(linode_instance_disk_tests):
         .rstrip()
     )
 
-    # TODO:: Add "disk_encryption" when spec shows the header
-    headers = ["id", "label", "status", "size", "filesystem"]
+    headers = ["id", "label", "status", "size", "filesystem", "disk_encryption"]
 
     assert_headers_in_lines(headers, res.splitlines())
diff --git a/tests/integration/ssh/test_plugin_ssh.py b/tests/integration/ssh/test_plugin_ssh.py
index ab060643a..136c8135c 100644
--- a/tests/integration/ssh/test_plugin_ssh.py
+++ b/tests/integration/ssh/test_plugin_ssh.py
@@ -8,12 +8,13 @@
 from tests.integration.helpers import (
     COMMAND_JSON_OUTPUT,
     exec_failing_test_command,
+    get_random_region_with_caps,
     get_random_text,
     wait_for_condition,
 )
 
-TEST_REGION = "us-southeast"
-TEST_IMAGE = "linode/alpine3.16"
+TEST_REGION = get_random_region_with_caps(required_capabilities=["Linodes"])
+TEST_IMAGE = "linode/ubuntu24.10"
 TEST_TYPE = "g6-nanode-1"
 TEST_ROOT_PASS = "r00tp@ss!long-long-and-longer"
 
diff --git a/tests/integration/vlans/test_vlans.py b/tests/integration/vlans/test_vlans.py
index b35171a12..894fef9f7 100644
--- a/tests/integration/vlans/test_vlans.py
+++ b/tests/integration/vlans/test_vlans.py
@@ -35,7 +35,7 @@ def test_list_vlans_help_menu():
         .rstrip()
     )
 
-    assert "linode-cli vlans ls\nList VLANs\n" in help_menu
+    assert "linode-cli vlans ls" in help_menu
     assert (
         "https://techdocs.akamai.com/linode-api/reference/get-vlans"
         in help_menu