refactor

Author: ykim-akamai

tests/integration/beta/helpers.py

@@ -1,3 +1,5 @@
+import pytest
+
 from tests.integration.helpers import (
     BASE_CMDS,
     exec_test_command,

tests/integration/conftest.py

@@ -23,17 +23,6 @@
     get_random_region_with_caps,
     get_random_text,
 )
-from tests.integration.linodes.helpers_linodes import (
-    DEFAULT_LINODE_TYPE,
-    DEFAULT_RANDOM_PASS,
-    DEFAULT_REGION,
-    DEFAULT_TEST_IMAGE,
-    create_linode_and_wait,
-)
-
-DOMAIN_BASE_CMD = ["linode-cli", "domains"]
-LINODE_BASE_CMD = ["linode-cli", "linodes"]
-NODEBALANCER_BASE_CMD = ["linode-cli", "nodebalancers"]
 
 
 @pytest.fixture(autouse=True, scope="session")
@@ -201,209 +190,6 @@ def _generate_test_files(
     return _generate_test_files
 
 
-# Test helpers specific to Linodes test suite
-@pytest.fixture
-def linode_with_label(linode_cloud_firewall):
-    timestamp = str(time.time_ns())
-    label = "cli" + timestamp
-    result = (
-        exec_test_command(
-            LINODE_BASE_CMD
-            + [
-                "create",
-                "--type",
-                "g6-nanode-1",
-                "--region",
-                "us-ord",
-                "--image",
-                DEFAULT_TEST_IMAGE,
-                "--label",
-                label,
-                "--root_pass",
-                DEFAULT_RANDOM_PASS,
-                "--firewall_id",
-                linode_cloud_firewall,
-                "--text",
-                "--delimiter",
-                ",",
-                "--no-headers",
-                "--format",
-                "label,region,type,image,id",
-                "--no-defaults",
-            ]
-        )
-        .stdout.decode()
-        .rstrip()
-    )
-
-    yield result
-    res_arr = result.split(",")
-    linode_id = res_arr[4]
-    delete_target_id(target="linodes", id=linode_id)
-
-
-@pytest.fixture
-def linode_min_req(linode_cloud_firewall):
-    result = (
-        exec_test_command(
-            LINODE_BASE_CMD
-            + [
-                "create",
-                "--type",
-                "g6-nanode-1",
-                "--region",
-                "us-ord",
-                "--root_pass",
-                DEFAULT_RANDOM_PASS,
-                "--firewall_id",
-                linode_cloud_firewall,
-                "--no-defaults",
-                "--text",
-                "--delimiter",
-                ",",
-                "--no-headers",
-                "--format",
-                "id,region,type",
-            ]
-        )
-        .stdout.decode()
-        .rstrip()
-    )
-
-    yield result
-
-    res_arr = result.split(",")
-    linode_id = res_arr[0]
-    delete_target_id(target="linodes", id=linode_id)
-
-
-@pytest.fixture
-def linode_wo_image(linode_cloud_firewall):
-    label = "cli" + str(int(time.time()) + randint(10, 1000))
-    linode_id = (
-        exec_test_command(
-            LINODE_BASE_CMD
-            + [
-                "create",
-                "--no-defaults",
-                "--label",
-                label,
-                "--type",
-                DEFAULT_LINODE_TYPE,
-                "--region",
-                DEFAULT_REGION,
-                "--root_pass",
-                DEFAULT_RANDOM_PASS,
-                "--firewall_id",
-                linode_cloud_firewall,
-                "--format",
-                "id",
-                "--no-headers",
-                "--text",
-            ]
-        )
-        .stdout.decode()
-        .rstrip()
-    )
-
-    yield linode_id
-
-    delete_target_id(target="linodes", id=linode_id)
-
-
-@pytest.fixture
-def linode_backup_enabled(linode_cloud_firewall):
-    # create linode with backups enabled
-    linode_id = (
-        exec_test_command(
-            [
-                "linode-cli",
-                "linodes",
-                "create",
-                "--backups_enabled",
-                "true",
-                "--type",
-                DEFAULT_LINODE_TYPE,
-                "--region",
-                DEFAULT_REGION,
-                "--image",
-                DEFAULT_TEST_IMAGE,
-                "--root_pass",
-                DEFAULT_RANDOM_PASS,
-                "--firewall_id",
-                linode_cloud_firewall,
-                "--text",
-                "--no-headers",
-                "--format=id",
-            ]
-        )
-        .stdout.decode()
-        .rstrip()
-    )
-
-    yield linode_id
-
-    delete_target_id("linodes", linode_id)
-
-
-@pytest.fixture
-def snapshot_of_linode():
-    timestamp = str(time.time_ns())
-    # get linode id after creation and wait for "running" status
-    linode_id = create_linode_and_wait()
-    new_snapshot_label = "test_snapshot" + timestamp
-
-    result = exec_test_command(
-        LINODE_BASE_CMD
-        + [
-            "snapshot",
-            linode_id,
-            "--label",
-            new_snapshot_label,
-            "--text",
-            "--delimiter",
-            ",",
-            "--no-headers",
-        ]
-    ).stdout.decode()
-
-    yield linode_id, new_snapshot_label
-
-    delete_target_id("linodes", linode_id)
-
-
-# Test helpers specific to Nodebalancers test suite
-@pytest.fixture
-def nodebalancer_with_default_conf(linode_cloud_firewall):
-    result = (
-        exec_test_command(
-            NODEBALANCER_BASE_CMD
-            + [
-                "create",
-                "--region",
-                "us-ord",
-                "--firewall_id",
-                linode_cloud_firewall,
-                "--text",
-                "--delimiter",
-                ",",
-                "--format",
-                "id,label,region,hostname,client_conn_throttle",
-                "--suppress-warnings",
-                "--no-headers",
-            ]
-        )
-        .stdout.decode()
-        .rstrip()
-    )
-
-    yield result
-
-    res_arr = result.split(",")
-    nodebalancer_id = res_arr[0]
-    delete_target_id(target="nodebalancers", id=nodebalancer_id)
-
-
 def create_vpc_w_subnet():
     """
     Creates and returns a VPC and a corresponding subnet.
@@ -416,8 +202,8 @@ def create_vpc_w_subnet():
     """
 
     region = get_random_region_with_caps(required_capabilities=["VPCs"])
-    vpc_label = str(time.time_ns()) + "label"
-    subnet_label = str(time.time_ns()) + "label"
+    vpc_label = get_random_text(5) + "label"
+    subnet_label = get_random_text(5) + "label"
 
     vpc_json = json.loads(
         exec_test_command(
@@ -437,8 +223,6 @@ def create_vpc_w_subnet():
                 "--suppress-warnings",
             ]
         )
-        .stdout.decode()
-        .rstrip()
     )[0]
 
     return vpc_json
@@ -449,45 +233,3 @@ def pytest_configure(config):
     config.addinivalue_line(
         "markers", "smoke: mark test as part of smoke test suite"
     )
-
-
-@pytest.fixture
-def support_test_linode_id(linode_cloud_firewall):
-    timestamp = str(time.time_ns())
-    label = "cli" + timestamp
-
-    res = (
-        exec_test_command(
-            LINODE_BASE_CMD
-            + [
-                "create",
-                "--type",
-                "g6-nanode-1",
-                "--region",
-                "us-mia",
-                "--image",
-                DEFAULT_TEST_IMAGE,
-                "--label",
-                label,
-                "--root_pass",
-                DEFAULT_RANDOM_PASS,
-                "--firewall_id",
-                linode_cloud_firewall,
-                "--text",
-                "--delimiter",
-                ",",
-                "--no-headers",
-                "--format",
-                "id",
-                "--no-defaults",
-            ]
-        )
-        .stdout.decode()
-        .rstrip()
-    )
-
-    linode_id = res
-
-    yield linode_id
-
-    delete_target_id(target="linodes", id=linode_id)

tests/integration/database/helpers.py

@@ -34,3 +34,47 @@ def get_engine_id():
         ]
     ).splitlines()
     return engine_ids[0] if engine_ids else None
+
+
+def get_expected_keys_pg_engine_config():
+    # Basic checks for pg config keys
+    return [
+        "autovacuum_analyze_scale_factor",
+        "autovacuum_analyze_threshold",
+        "autovacuum_max_workers",
+        "autovacuum_naptime",
+        "autovacuum_vacuum_cost_delay",
+        "autovacuum_vacuum_cost_limit",
+        "autovacuum_vacuum_scale_factor",
+        "autovacuum_vacuum_threshold",
+        "bgwriter_delay",
+        "bgwriter_flush_after",
+        "bgwriter_lru_maxpages",
+        "bgwriter_lru_multiplier",
+        "deadlock_timeout",
+        "default_toast_compression",
+        "idle_in_transaction_session_timeout",
+        "jit",
+        "max_files_per_process",
+        "max_locks_per_transaction",
+        "max_logical_replication_workers",
+        "max_parallel_workers",
+        "max_parallel_workers_per_gather",
+        "max_pred_locks_per_transaction",
+        "max_replication_slots",
+        "max_slot_wal_keep_size",
+        "max_stack_depth",
+        "max_standby_archive_delay",
+        "max_standby_streaming_delay",
+        "max_wal_senders",
+        "max_worker_processes",
+        "password_encryption",
+        "temp_file_limit",
+        "timezone",
+        "track_activity_query_size",
+        "track_commit_timestamp",
+        "track_functions",
+        "track_io_timing",
+        "wal_sender_timeout",
+        "wal_writer_delay",
+    ]