Regression fixes (#647)

* Add waits for Linodes to improve flaky tests

* Increase timeout for Linode's 'offline' status

* Revert import changes in test_account.py

Author: mawilk90

test/integration/models/account/test_account.py

@@ -1,7 +1,11 @@
 import time
 from datetime import datetime
 from test.integration.conftest import get_region
-from test.integration.helpers import get_test_label, retry_sending_request
+from test.integration.helpers import (
+    get_test_label,
+    retry_sending_request,
+    wait_for_condition,
+)
 
 import pytest
 
@@ -102,13 +106,18 @@ def test_latest_get_event(test_linode_client, e2e_test_firewall):
         firewall=e2e_test_firewall,
     )
 
-    events = client.load(Event, "")
+    def get_linode_status():
+        return linode.status == "running"
 
-    latest_events = events._raw_json.get("data")
+    # To ensure the Linode is running and the 'event' key has been populated
+    wait_for_condition(3, 100, get_linode_status)
+
+    events = client.load(Event, "")
+    latest_events = events._raw_json.get("data")[:15]
 
     linode.delete()
 
-    for event in latest_events[:15]:
+    for event in latest_events:
         if label == event["entity"]["label"]:
             break
     else:

test/integration/models/domain/test_domain.py

@@ -43,10 +43,10 @@ def test_clone(test_linode_client, test_domain):
     dom = "example.clone-" + timestamp + "-inttestsdk.org"
     domain.clone(dom)
 
-    ds = test_linode_client.domains()
-
     time.sleep(1)
 
+    ds = test_linode_client.domains()
+
     domains = [i.domain for i in ds]
 
     assert dom in domains

test/integration/models/linode/test_linode.py

@@ -611,6 +611,12 @@ def test_linode_initate_migration(test_linode_client, e2e_test_firewall):
         migration_type=MigrationType.COLD,
     )
 
+    def get_linode_status():
+        return linode.status == "offline"
+
+    # To verify that Linode's status changed before deletion (during migration status is set to 'offline')
+    wait_for_condition(5, 120, get_linode_status)
+
     res = linode.delete()
 
     assert res

test/integration/models/networking/test_networking.py

@@ -32,7 +32,7 @@
 )
 
 
-def create_linode(test_linode_client):
+def create_linode_func(test_linode_client):
     client = test_linode_client
 
     label = get_test_label()
@@ -49,7 +49,7 @@ def create_linode(test_linode_client):
 
 @pytest.fixture
 def create_linode_for_ip_share(test_linode_client):
-    linode = create_linode(test_linode_client)
+    linode = create_linode_func(test_linode_client)
 
     yield linode
 
@@ -58,7 +58,7 @@ def create_linode_for_ip_share(test_linode_client):
 
 @pytest.fixture
 def create_linode_to_be_shared_with_ips(test_linode_client):
-    linode = create_linode(test_linode_client)
+    linode = create_linode_func(test_linode_client)
 
     yield linode
 
@@ -302,6 +302,8 @@ def test_create_and_delete_vlan(test_linode_client, linode_for_vlan_tests):
     wait_for_condition(3, 100, get_status, linode, "rebooting")
     assert linode.status == "rebooting"
 
+    wait_for_condition(3, 100, get_status, linode, "running")
+
     # Delete the VLAN
     is_deleted = test_linode_client.networking.delete_vlan(
         vlan_label, linode.region
@@ -334,6 +336,7 @@ def test_get_global_firewall_settings(test_linode_client):
 
 def test_ip_info(test_linode_client, create_linode):
     linode = create_linode
+    wait_for_condition(3, 100, get_status, linode, "running")
 
     ip_info = test_linode_client.load(IPAddress, linode.ipv4[0])