Merge branch 'dev' into proj/enhanced-interfaces

Author: zliang-akamai

test/integration/models/linode/test_linode.py

@@ -364,6 +364,7 @@ def test_linode_resize(create_linode_for_long_running_tests):
     assert linode.status == "running"
 
 
+@pytest.mark.flaky(reruns=3, reruns_delay=2)
 def test_linode_resize_with_class(
     test_linode_client, create_linode_for_long_running_tests
 ):

test/integration/models/object_storage/test_obj.py

@@ -1,5 +1,5 @@
 import time
-from test.integration.conftest import get_region
+from test.integration.helpers import send_request_when_resource_available
 
 import pytest
 
@@ -18,7 +18,7 @@
 
 @pytest.fixture(scope="session")
 def region(test_linode_client: LinodeClient):
-    return get_region(test_linode_client, {"Object Storage"}).id
+    return "us-southeast"  # uncomment get_region(test_linode_client, {"Object Storage"}).id
 
 
 @pytest.fixture(scope="session")
@@ -38,7 +38,7 @@ def bucket(
     )
 
     yield bucket
-    bucket.delete()
+    send_request_when_resource_available(timeout=100, func=bucket.delete)
 
 
 @pytest.fixture(scope="session")
@@ -63,7 +63,8 @@ def bucket_with_endpoint(
     )
 
     yield bucket
-    bucket.delete()
+
+    send_request_when_resource_available(timeout=100, func=bucket.delete)
 
 
 @pytest.fixture(scope="session")