test: Update outdated backup test and address test warnings messages (#600)

Co-authored-by: Zhiwei Liang <[email protected]>

Author: ykim-akamai

Makefile

@@ -1,7 +1,7 @@
 #
 # Makefile for more convenient building of the Linode CLI and its baked content
 #
-INTEGRATION_TEST_PATH :=
+MODULE :=
 TEST_CASE_COMMAND :=
 
 ifdef TEST_CASE
@@ -62,7 +62,7 @@ testunit:
 
 .PHONY: testint
 testint:
-	pytest tests/integration/${INTEGRATION_TEST_PATH} ${TEST_CASE_COMMAND} --disable-warnings
+	pytest tests/integration/${MODULE} ${TEST_CASE_COMMAND}
 
 .PHONY: testall
 testall:
@@ -89,4 +89,4 @@ format: black isort autoflake
 
 @PHONEY: smoketest
 smoketest:
-	pytest -m smoke tests/integration --disable-warnings
+	pytest -m smoke tests/integration

tests/integration/conftest.py

@@ -443,3 +443,10 @@ def create_vpc_w_subnet():
     )[0]
 
     return vpc_json
+
+
+@pytest.mark.smoke
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers", "smoke: mark test as part of smoke test suite"
+    )

tests/integration/linodes/helpers_linodes.py

@@ -99,6 +99,38 @@ def create_linode(test_region=DEFAULT_REGION):
     return linode_id
 
 
+def create_linode_backup_disabled(test_region=DEFAULT_REGION):
+    result = set_backups_enabled_in_account_settings(toggle=False)
+
+    # create linode
+    linode_id = (
+        exec_test_command(
+            [
+                "linode-cli",
+                "linodes",
+                "create",
+                "--type",
+                DEFAULT_LINODE_TYPE,
+                "--region",
+                test_region,
+                "--image",
+                DEFAULT_TEST_IMAGE,
+                "--root_pass",
+                DEFAULT_RANDOM_PASS,
+                "--format=id",
+                "--text",
+                "--no-headers",
+                "--backups_enabled",
+                "false",
+            ]
+        )
+        .stdout.decode()
+        .rstrip()
+    )
+
+    return linode_id
+
+
 def shutdown_linodes():
     linode_ids = (
         exec_test_command(
@@ -205,10 +237,30 @@ def create_linode_and_wait(
         )
     linode_id = output
 
-    # wait until linode is running
-    assert (
-        wait_until(linode_id=linode_id, timeout=240, status="running"),
-        "linode failed to change status to running",
-    )
+    # wait until linode is running, wait_until returns True when it is in running state
+    result = (wait_until(linode_id=linode_id, timeout=240, status="running"),)
+
+    assert result, "linode failed to change status to running"
 
     return linode_id
+
+
+def set_backups_enabled_in_account_settings(toggle: bool):
+    command = [
+        "linode-cli",
+        "account",
+        "settings-update",
+        "--format",
+        "backups_enabled",
+        "--text",
+        "--no-headers",
+    ]
+
+    if toggle:
+        command.extend(["--backups_enabled", "true"])
+    else:
+        command.extend(["--backups_enabled", "false"])
+
+    result = exec_test_command(command).stdout.decode().rstrip()
+
+    return result

tests/integration/linodes/test_backups.py

@@ -8,6 +8,8 @@
     BASE_CMD,
     create_linode,
     create_linode_and_wait,
+    create_linode_backup_disabled,
+    set_backups_enabled_in_account_settings,
 )
 
 # ##################################################################
@@ -26,12 +28,32 @@ def create_linode_setup():
     delete_target_id("linodes", linode_id)
 
 
-def test_create_linode_with_backup_disabled(create_linode_setup):
-    linode_id = create_linode_setup
+@pytest.fixture
+def create_linode_backup_disabled_setup():
+    res = set_backups_enabled_in_account_settings(toggle=False)
+
+    if res == "True":
+        raise ValueError(
+            "Backups are unexpectedly enabled before setting up the test."
+        )
+
+    linode_id = create_linode_backup_disabled()
+
+    yield linode_id
+
+    delete_target_id("linodes", linode_id)
+
+
+def test_create_linode_with_backup_disabled(
+    create_linode_backup_disabled_setup,
+):
+    linode_id = create_linode_backup_disabled_setup
     result = exec_test_command(
         BASE_CMD
         + [
             "list",
+            "--id",
+            linode_id,
             "--format=id,enabled",
             "--delimiter",
             ",",
@@ -42,6 +64,10 @@ def test_create_linode_with_backup_disabled(create_linode_setup):
 
     assert re.search(linode_id + ",False", result)
 
+    result = set_backups_enabled_in_account_settings(toggle=True)
+
+    assert "True" in result
+
 
 @pytest.mark.smoke
 def test_enable_backups(create_linode_setup):