Add test integration (#593)

Author: vshanthe

tests/integration/account/test_account.py

@@ -1,3 +1,5 @@
+import pytest
+
 from tests.integration.helpers import assert_headers_in_lines, exec_test_command
 
 BASE_CMD = ["linode-cli", "account"]
@@ -39,16 +41,36 @@ def test_event_list():
         .rstrip()
     )
     lines = res.splitlines()
-
-    event_id = lines[1].split(",")[0]
-
     headers = ["entity.label", "username"]
     assert_headers_in_lines(headers, lines)
-    return event_id
 
 
-def test_event_view():
-    event_id = test_event_list()
+@pytest.fixture
+def get_event_id():
+    event_id = (
+        exec_test_command(
+            [
+                "linode-cli",
+                "events",
+                "list",
+                "--text",
+                "--no-headers",
+                "--delimiter",
+                ",",
+                "--format",
+                "id",
+            ]
+        )
+        .stdout.decode()
+        .rstrip()
+        .splitlines()
+    )
+    first_id = event_id[0].split(",")[0]
+    yield first_id
+
+
+def test_event_view(get_event_id):
+    event_id = get_event_id
     res = (
         exec_test_command(
             [
@@ -78,16 +100,35 @@ def test_account_invoice_list():
         .rstrip()
     )
     lines = res.splitlines()
-
-    invoice_id = lines[1].split(",")[0]
-
     headers = ["billing_source", "tax", "subtotal"]
     assert_headers_in_lines(headers, lines)
-    return invoice_id
 
 
-def test_account_invoice_view():
-    invoice_id = test_account_invoice_list()
+@pytest.fixture
+def get_invoice_id():
+    invoice_id = (
+        exec_test_command(
+            BASE_CMD
+            + [
+                "invoices-list",
+                "--text",
+                "--no-headers",
+                "--delimiter",
+                ",",
+                "--format",
+                "id",
+            ]
+        )
+        .stdout.decode()
+        .rstrip()
+        .splitlines()
+    )
+    first_id = invoice_id[0]
+    yield first_id
+
+
+def test_account_invoice_view(get_invoice_id):
+    invoice_id = get_invoice_id
     res = (
         exec_test_command(
             BASE_CMD + ["invoice-view", invoice_id, "--text", "--delimiter=,"]
@@ -101,8 +142,8 @@ def test_account_invoice_view():
     assert_headers_in_lines(headers, lines)
 
 
-def test_account_invoice_items():
-    invoice_id = test_account_invoice_list()
+def test_account_invoice_items(get_invoice_id):
+    invoice_id = get_invoice_id
     res = (
         exec_test_command(
             BASE_CMD + ["invoice-items", invoice_id, "--text", "--delimiter=,"]
@@ -123,16 +164,35 @@ def test_account_logins_list():
         .rstrip()
     )
     lines = res.splitlines()
-
-    login_id = lines[1].split(",")[0]
-
     headers = ["ip", "username", "status"]
     assert_headers_in_lines(headers, lines)
-    return login_id
 
 
-def test_account_login_view():
-    login_id = test_account_logins_list()
+@pytest.fixture
+def get_login_id():
+    login_id = (
+        exec_test_command(
+            BASE_CMD
+            + [
+                "logins-list",
+                "--text",
+                "--no-headers",
+                "--delimiter",
+                ",",
+                "--format",
+                "id",
+            ]
+        )
+        .stdout.decode()
+        .rstrip()
+        .splitlines()
+    )
+    first_id = login_id[0]
+    yield first_id
+
+
+def test_account_login_view(get_login_id):
+    login_id = get_login_id
     res = (
         exec_test_command(
             BASE_CMD + ["login-view", login_id, "--text", "--delimiter=,"]
@@ -167,16 +227,36 @@ def test_user_list():
         .rstrip()
     )
     lines = res.splitlines()
-
-    user_id = lines[1].split(",")[0]
-
     headers = ["email", "username"]
     assert_headers_in_lines(headers, lines)
-    return user_id
 
 
-def test_user_view():
-    user_id = test_user_list()
+@pytest.fixture
+def get_user_id():
+    user_id = (
+        exec_test_command(
+            [
+                "linode-cli",
+                "users",
+                "list",
+                "--text",
+                "--no-headers",
+                "--delimiter",
+                ",",
+                "--format",
+                "id",
+            ]
+        )
+        .stdout.decode()
+        .rstrip()
+        .splitlines()
+    )
+    first_id = user_id[0].split(",")[0]
+    yield first_id
+
+
+def test_user_view(get_user_id):
+    user_id = get_user_id
     res = (
         exec_test_command(
             ["linode-cli", "users", "view", user_id, "--text", "--delimiter=,"]

tests/integration/beta/test_beta_program.py

@@ -16,14 +16,35 @@ def test_beta_list():
     if len(lines) < 2 or len(lines[1].split(",")) == 0:
         pytest.skip("No beta program available to test")
     else:
-        beta_id = lines[1].split(",")[0]
         headers = ["label", "description"]
         assert_headers_in_lines(headers, lines)
-        return beta_id
 
 
-def test_beta_view():
-    beta_id = test_beta_list()
+@pytest.fixture
+def get_beta_id():
+    beta_id = (
+        exec_test_command(
+            BASE_CMD
+            + [
+                "list",
+                "--text",
+                "--no-headers",
+                "--delimiter",
+                ",",
+                "--format",
+                "id",
+            ]
+        )
+        .stdout.decode()
+        .rstrip()
+        .splitlines()
+    )
+    first_id = beta_id[0]
+    yield first_id
+
+
+def test_beta_view(get_beta_id):
+    beta_id = get_beta_id
     if beta_id is None:
         pytest.skip("No beta program available to test")
     else:

tests/integration/database/test_database.py

@@ -16,16 +16,35 @@ def test_engines_list():
         .rstrip()
     )
     lines = res.splitlines()
-
-    engine_id = lines[1].split(",")[0]
-
     headers = ["id", "engine", "version"]
     assert_headers_in_lines(headers, lines)
-    return engine_id
 
 
-def test_engines_view():
-    engine_id = test_engines_list()
+@pytest.fixture
+def get_engine_id():
+    engine_id = (
+        exec_test_command(
+            BASE_CMD
+            + [
+                "engines",
+                "--text",
+                "--no-headers",
+                "--delimiter",
+                ",",
+                "--format",
+                "id",
+            ]
+        )
+        .stdout.decode()
+        .rstrip()
+        .splitlines()
+    )
+    first_id = engine_id[0]
+    yield first_id
+
+
+def test_engines_view(get_engine_id):
+    engine_id = get_engine_id
     res = (
         exec_test_command(
             BASE_CMD + ["engine-view", engine_id, "--text", "--delimiter=,"]
@@ -90,16 +109,35 @@ def test_databases_types():
         .rstrip()
     )
     lines = res.splitlines()
-
-    node_id = lines[1].split(",")[0]
-
     headers = ["id", "label", "_split"]
     assert_headers_in_lines(headers, lines)
-    return node_id
 
 
-def test_databases_type_view():
-    node_id = test_databases_types()
+@pytest.fixture
+def get_node_id():
+    node_id = (
+        exec_test_command(
+            BASE_CMD
+            + [
+                "types",
+                "--text",
+                "--no-headers",
+                "--delimiter",
+                ",",
+                "--format",
+                "id",
+            ]
+        )
+        .stdout.decode()
+        .rstrip()
+        .splitlines()
+    )
+    first_id = node_id[0]
+    yield first_id
+
+
+def test_databases_type_view(get_node_id):
+    node_id = get_node_id
     res = (
         exec_test_command(
             BASE_CMD + ["type-view", node_id, "--text", "--delimiter=,"]

tests/integration/helpers.py

@@ -63,8 +63,9 @@ def delete_tag(arg: str):
     assert result.returncode == SUCCESS_STATUS_CODE
 
 
-def delete_target_id(target: str, id: str):
-    result = exec_test_command(["linode-cli", target, "delete", id])
+def delete_target_id(target: str, id: str, subcommand: str = "delete"):
+    command = ["linode-cli", target, subcommand, id]
+    result = exec_test_command(command)
     assert result.returncode == SUCCESS_STATUS_CODE
 
 
@@ -89,11 +90,6 @@ def remove_lke_clusters():
         exec_test_command(["linode-cli", "lke", "cluster-delete", id])
 
 
-def delete_target_id(target: str, id: str):
-    result = exec_test_command(["linode-cli", target, "delete", id])
-    assert result.returncode == SUCCESS_STATUS_CODE
-
-
 def remove_all(target: str):
     entity_ids = ""
     if target == "stackscripts":