Merge branch 'dev' into proj/nb-front-end-ip-in-vpc

Author: mawilk90

test/integration/conftest.py

@@ -326,7 +326,7 @@ def get_domain_status():
         domain.invalidate()
         return domain.status == "active"
 
-    wait_for_condition(3, 30, get_domain_status)
+    wait_for_condition(3, 45, get_domain_status)
 
     # Create a SRV record
     domain.record_create(

test/integration/models/account/test_account.py

@@ -39,6 +39,9 @@ def test_get_account(test_linode_client):
     assert account_get.tax_id == account.tax_id
 
 
+@pytest.mark.skip(
+    reason="Test fails for E2E test user with [504] Server Timeout due to enormous amount of logins. More details: ARB-7420"
+)
 def test_get_login(test_linode_client):
     client = test_linode_client
     login = retry_sending_request(3, client.load, Login(client, "", {}), "")
@@ -91,6 +94,8 @@ def test_update_maintenance_policy(test_linode_client):
     assert updated.maintenance_policy == original_policy
 
 
+# May fail due to multiple events occurring on the test user in the same time
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
 @pytest.mark.smoke
 def test_latest_get_event(test_linode_client, e2e_test_firewall):
     client = test_linode_client
@@ -115,15 +120,15 @@ def get_linode_status():
     wait_for_condition(5, 150, get_linode_status)
 
     events = client.load(Event, "")
-    latest_events = events._raw_json.get("data")[:15]
+    latest_events = events._raw_json.get("data")[:50]
 
     linode.delete()
 
     for event in latest_events:
         if label == event["entity"]["label"]:
             break
     else:
-        assert False, f"Linode '{label}' not found in the last 15 events"
+        assert False, f"Linode '{label}' not found in the last 50 events"
 
 
 def test_get_user(test_linode_client):

test/integration/models/image/test_image.py

@@ -43,12 +43,10 @@ def image_upload_url(test_linode_client):
 
     region = get_image_upload_regions(test_linode_client)[0]
 
-    test_linode_client.image_create_upload(
+    image, _ = test_linode_client.image_create_upload(
         label, region.id, "integration test image upload"
     )
 
-    image = test_linode_client.images()[0]
-
     yield image
 
     image.delete()

test/integration/models/linode/test_linode.py

@@ -641,8 +641,22 @@ def test_linode_ips(create_linode):
 
 def test_linode_initate_migration(test_linode_client, e2e_test_firewall):
     client = test_linode_client
-    region = get_region(client, {"Linodes", "Cloud Firewall"}, site_type="core")
     label = get_test_label() + "_migration"
+    region = get_region(client, {"Linodes", "Cloud Firewall"}, site_type="core")
+    region_migrate = get_region(
+        client, {"Linodes", "Cloud Firewall"}, site_type="core"
+    )
+
+    # Cannot migrate linode to the same region
+    for _ in range(5):
+        if region_migrate.id != region.id:
+            break
+
+        region_migrate = get_region(
+            client, {"Linodes", "Cloud Firewall"}, site_type="core"
+        )
+    else:
+        pytest.skip("No alternative region to be used for linode migration")
 
     linode = client.linode.instance_create(
         "g6-nanode-1",
@@ -657,7 +671,7 @@ def test_linode_initate_migration(test_linode_client, e2e_test_firewall):
     send_request_when_resource_available(
         300,
         linode.initiate_migration,
-        region="us-central",
+        region=region_migrate,
         migration_type=MigrationType.COLD,
     )
 

test/integration/models/networking/test_networking.py

@@ -304,14 +304,14 @@ def test_create_and_delete_vlan(test_linode_client, linode_for_vlan_tests):
     config.interfaces = []
     config.save()
 
-    wait_for_condition(3, 100, get_status, linode, "running")
+    wait_for_condition(3, 150, get_status, linode, "running")
 
     retry_sending_request(3, linode.reboot)
 
     wait_for_condition(3, 100, get_status, linode, "rebooting")
     assert linode.status == "rebooting"
 
-    wait_for_condition(3, 100, get_status, linode, "running")
+    wait_for_condition(3, 150, get_status, linode, "running")
 
     # Delete the VLAN
     is_deleted = test_linode_client.networking.delete_vlan(

test/integration/models/sharegroups/test_sharegroups.py

@@ -33,7 +33,7 @@ def wait_for_image_status(
         )
 
 
-@pytest.fixture(scope="class")
+@pytest.fixture(scope="module")
 def sample_linode(test_linode_client, e2e_test_firewall):
     client = test_linode_client
     region = get_region(client, {"Linodes", "Cloud Firewall"}, site_type="core")
@@ -50,14 +50,16 @@ def sample_linode(test_linode_client, e2e_test_firewall):
     linode_instance.delete()
 
 
-@pytest.fixture(scope="class")
+@pytest.fixture(scope="module")
 def create_image_id(test_linode_client, sample_linode):
     create_image = test_linode_client.images.create(
         sample_linode.disks[0],
-        label="linode-api4python-test-image-sharing-image",
+        label=get_test_label(8) + "_sharing-image",
     )
     wait_for_image_status(test_linode_client, create_image.id, "available")
+
     yield create_image.id
+
     create_image.delete()