test: Update E2E Tests, improve test fixture namin/teardowns (#341)

Author: ykim-akamai

test/integration/conftest.py

@@ -3,6 +3,7 @@
 
 import pytest
 
+from linode_api4 import ApiError
 from linode_api4.linode_client import LinodeClient
 
 ENV_TOKEN_NAME = "LINODE_TOKEN"
@@ -29,15 +30,15 @@ def run_long_tests():
 
 
 @pytest.fixture(scope="session")
-def create_linode(get_client):
-    client = get_client
+def create_linode(test_linode_client):
+    client = test_linode_client
     available_regions = client.regions()
     chosen_region = available_regions[0]
-    timestamp = str(int(time.time()))
+    timestamp = str(time.time_ns())
     label = "TestSDK-" + timestamp
 
     linode_instance, password = client.linode.instance_create(
-        "g5-standard-4", chosen_region, image="linode/debian9", label=label
+        "g6-nanode-1", chosen_region, image="linode/debian10", label=label
     )
 
     yield linode_instance
@@ -46,15 +47,15 @@ def create_linode(get_client):
 
 
 @pytest.fixture
-def create_linode_for_pass_reset(get_client):
-    client = get_client
+def create_linode_for_pass_reset(test_linode_client):
+    client = test_linode_client
     available_regions = client.regions()
     chosen_region = available_regions[0]
-    timestamp = str(int(time.time()))
+    timestamp = str(time.time_ns())
     label = "TestSDK-" + timestamp
 
     linode_instance, password = client.linode.instance_create(
-        "g5-standard-4", chosen_region, image="linode/debian9", label=label
+        "g6-nanode-1", chosen_region, image="linode/debian10", label=label
     )
 
     yield linode_instance, password
@@ -80,7 +81,7 @@ def ssh_key_gen():
 
 
 @pytest.fixture(scope="session")
-def get_client():
+def test_linode_client():
     token = get_token()
     api_url = get_api_url()
     api_ca_file = get_api_ca_file()
@@ -93,8 +94,8 @@ def get_client():
 
 
 @pytest.fixture
-def set_account_settings(get_client):
-    client = get_client
+def test_account_settings(test_linode_client):
+    client = test_linode_client
     account_settings = client.account.settings()
     account_settings._populated = True
     account_settings.network_helper = True
@@ -103,10 +104,10 @@ def set_account_settings(get_client):
 
 
 @pytest.fixture(scope="session")
-def create_domain(get_client):
-    client = get_client
+def test_domain(test_linode_client):
+    client = test_linode_client
 
-    timestamp = str(int(time.time()))
+    timestamp = str(time.time_ns())
     domain_addr = timestamp + "-example.com"
     soa_email = "[email protected]"
 
@@ -130,23 +131,36 @@ def create_domain(get_client):
 
 
 @pytest.fixture(scope="session")
-def create_volume(get_client):
-    client = get_client
-    timestamp = str(int(time.time()))
+def test_volume(test_linode_client):
+    client = test_linode_client
+    timestamp = str(time.time_ns())
     label = "TestSDK-" + timestamp
 
     volume = client.volume_create(label=label, region="ap-west")
 
     yield volume
 
-    volume.delete()
+    timeout = 100  # give 100s for volume to be detached before deletion
+
+    start_time = time.time()
+
+    while time.time() - start_time < timeout:
+        try:
+            res = volume.delete()
+            if res:
+                break
+            else:
+                time.sleep(3)
+        except ApiError as e:
+            if time.time() - start_time > timeout:
+                raise e
 
 
 @pytest.fixture
-def create_tag(get_client):
-    client = get_client
+def test_tag(test_linode_client):
+    client = test_linode_client
 
-    timestamp = str(int(time.time()))
+    timestamp = str(time.time_ns())
     label = "TestSDK-" + timestamp
 
     tag = client.tag_create(label=label)
@@ -157,10 +171,10 @@ def create_tag(get_client):
 
 
 @pytest.fixture
-def create_nodebalancer(get_client):
-    client = get_client
+def test_nodebalancer(test_linode_client):
+    client = test_linode_client
 
-    timestamp = str(int(time.time()))
+    timestamp = str(time.time_ns())
     label = "TestSDK-" + timestamp
 
     nodebalancer = client.nodebalancer_create(region="us-east", label=label)
@@ -171,9 +185,9 @@ def create_nodebalancer(get_client):
 
 
 @pytest.fixture
-def create_longview_client(get_client):
-    client = get_client
-    timestamp = str(int(time.time()))
+def test_longview_client(test_linode_client):
+    client = test_linode_client
+    timestamp = str(time.time_ns())
     label = "TestSDK-" + timestamp
     longview_client = client.longview.client_create(label=label)
 
@@ -183,9 +197,9 @@ def create_longview_client(get_client):
 
 
 @pytest.fixture
-def upload_sshkey(get_client, ssh_key_gen):
+def test_sshkey(test_linode_client, ssh_key_gen):
     pub_key = ssh_key_gen[0]
-    client = get_client
+    client = test_linode_client
     key = client.profile.ssh_key_upload(pub_key, "IntTestSDK-sshkey")
 
     yield key
@@ -194,8 +208,8 @@ def upload_sshkey(get_client, ssh_key_gen):
 
 
 @pytest.fixture
-def create_ssh_keys_object_storage(get_client):
-    client = get_client
+def ssh_keys_object_storage(test_linode_client):
+    client = test_linode_client
     label = "TestSDK-obj-storage-key"
     key = client.object_storage.keys_create(label)
 
@@ -205,8 +219,8 @@ def create_ssh_keys_object_storage(get_client):
 
 
 @pytest.fixture(scope="session")
-def create_firewall(get_client):
-    client = get_client
+def test_firewall(test_linode_client):
+    client = test_linode_client
     rules = {
         "outbound": [],
         "outbound_policy": "DROP",
@@ -224,8 +238,8 @@ def create_firewall(get_client):
 
 
 @pytest.fixture
-def create_oauth_client(get_client):
-    client = get_client
+def test_oauth_client(test_linode_client):
+    client = test_linode_client
     oauth_client = client.account.oauth_client_create(
         "test-oauth-client", "https://localhost/oauth/callback"
     )