Add required skipifs for integration tests (#2462)

qingchm · web-flow · commit 507fa1e89713 · 2022-08-05T10:32:33.000-07:00
diff --git a/integration/combination/test_api_with_authorizer_apikey.py b/integration/combination/test_api_with_authorizer_apikey.py
@@ -1,8 +1,15 @@
+from unittest.case import skipIf
+
 from integration.helpers.base_test import BaseTest
 from integration.helpers.deployer.utils.retry import retry
 from integration.helpers.exception import StatusCodeError
 
 
+from integration.helpers.resource import current_region_does_not_support
+from integration.config.service_names import REST_API
+
+
+@skipIf(current_region_does_not_support([REST_API]), "RestApi is not supported in this testing region")
 class TestApiWithAuthorizerApiKey(BaseTest):
     def test_authorizer_apikey(self):
         self.create_and_verify_stack("combination/api_with_authorizer_apikey")
diff --git a/integration/combination/test_api_with_disable_execute_api_endpoint.py b/integration/combination/test_api_with_disable_execute_api_endpoint.py
@@ -1,8 +1,14 @@
+from unittest.case import skipIf
 from parameterized import parameterized
 
 from integration.helpers.base_test import BaseTest
 
 
+from integration.helpers.resource import current_region_does_not_support
+from integration.config.service_names import REST_API
+
+
+@skipIf(current_region_does_not_support([REST_API]), "RestApi is not supported in this testing region")
 class TestApiWithDisableExecuteApiEndpoint(BaseTest):
     @parameterized.expand(
         [
diff --git a/integration/combination/test_api_with_fail_on_warnings.py b/integration/combination/test_api_with_fail_on_warnings.py
@@ -1,8 +1,12 @@
+from unittest.case import skipIf
 from parameterized import parameterized
 
 from integration.helpers.base_test import BaseTest
+from integration.helpers.resource import current_region_does_not_support
+from integration.config.service_names import REST_API
 
 
+@skipIf(current_region_does_not_support([REST_API]), "RestApi is not supported in this testing region")
 class TestApiWithFailOnWarnings(BaseTest):
     @parameterized.expand(
         [
diff --git a/integration/combination/test_function_with_kinesis.py b/integration/combination/test_function_with_kinesis.py
@@ -29,6 +29,7 @@ def test_function_with_kinesis_trigger(self):
         self.assertEqual(event_source_mapping_kinesis_stream_arn, kinesis_stream["StreamARN"])
 
 
+@skipIf(current_region_does_not_support([KINESIS]), "Kinesis is not supported in this testing region")
 class TestFunctionWithKinesisIntrinsics(BaseTest):
     def test_function_with_kinesis_trigger(self):
         self.create_and_verify_stack("combination/function_with_kinesis_intrinsics")
diff --git a/integration/combination/test_state_machine_with_api.py b/integration/combination/test_state_machine_with_api.py
@@ -1,7 +1,16 @@
+from unittest.case import skipIf
 from integration.helpers.base_test import BaseTest
 from integration.helpers.common_api import get_policy_statements
 
 
+from integration.helpers.resource import current_region_does_not_support
+from integration.config.service_names import STATE_MACHINE_WITH_APIS
+
+
+@skipIf(
+    current_region_does_not_support([STATE_MACHINE_WITH_APIS]),
+    "StateMachine with APIs is not supported in this testing region",
+)
 class TestStateMachineWithApi(BaseTest):
     def test_state_machine_with_api(self):
         self.create_and_verify_stack("combination/state_machine_with_api")
diff --git a/integration/combination/test_state_machine_with_cwe.py b/integration/combination/test_state_machine_with_cwe.py
@@ -1,7 +1,15 @@
+from unittest.case import skipIf
 from integration.helpers.base_test import BaseTest
 from integration.helpers.common_api import get_policy_statements
 
+from integration.helpers.resource import current_region_does_not_support
+from integration.config.service_names import STATE_MACHINE_CWE_CWS
 
+
+@skipIf(
+    current_region_does_not_support([STATE_MACHINE_CWE_CWS]),
+    "StateMachineCWECWS is not supported in this testing region",
+)
 class TestStateMachineWithCwe(BaseTest):
     def test_state_machine_with_cwe(self):
         self.create_and_verify_stack("combination/state_machine_with_cwe")
diff --git a/integration/combination/test_state_machine_with_cwe_dlq_and_retry_policy.py b/integration/combination/test_state_machine_with_cwe_dlq_and_retry_policy.py
@@ -2,10 +2,13 @@
 
 from integration.helpers.base_test import BaseTest
 from integration.helpers.resource import current_region_does_not_support
-from integration.config.service_names import CWE_CWS_DLQ
+from integration.config.service_names import CWE_CWS_DLQ, STATE_MACHINE_CWE_CWS
 
 
-@skipIf(current_region_does_not_support([CWE_CWS_DLQ]), "CweCwsDlq is not supported in this testing region")
+@skipIf(
+    current_region_does_not_support([CWE_CWS_DLQ, STATE_MACHINE_CWE_CWS]),
+    "CweCwsDlq is not supported in this testing region",
+)
 class TestStateMachineWithCweDlqAndRetryPolicy(BaseTest):
     def test_state_machine_with_api(self):
         self.create_and_verify_stack("combination/state_machine_with_cwe_with_dlq_and_retry_policy")
diff --git a/integration/combination/test_state_machine_with_cwe_dlq_generated.py b/integration/combination/test_state_machine_with_cwe_dlq_generated.py
@@ -3,10 +3,13 @@
 from integration.helpers.base_test import BaseTest
 from integration.helpers.common_api import get_policy_statements, get_queue_policy
 from integration.helpers.resource import current_region_does_not_support
-from integration.config.service_names import CWE_CWS_DLQ
+from integration.config.service_names import CWE_CWS_DLQ, STATE_MACHINE_CWE_CWS
 
 
-@skipIf(current_region_does_not_support([CWE_CWS_DLQ]), "CweCwsDlq is not supported in this testing region")
+@skipIf(
+    current_region_does_not_support([CWE_CWS_DLQ, STATE_MACHINE_CWE_CWS]),
+    "CweCwsDlq is not supported in this testing region",
+)
 class TestStateMachineWithCweDlqGenerated(BaseTest):
     def test_state_machine_with_cwe(self):
         self.create_and_verify_stack("combination/state_machine_with_cwe_dlq_generated")
diff --git a/integration/combination/test_state_machine_with_schedule.py b/integration/combination/test_state_machine_with_schedule.py
@@ -1,7 +1,16 @@
+from unittest.case import skipIf
 from integration.helpers.base_test import BaseTest
 from integration.helpers.common_api import get_policy_statements
 
 
+from integration.helpers.resource import current_region_does_not_support
+from integration.config.service_names import STATE_MACHINE_CWE_CWS
+
+
+@skipIf(
+    current_region_does_not_support([STATE_MACHINE_CWE_CWS]),
+    "StateMachine CweCws is not supported in this testing region",
+)
 class TestStateMachineWithSchedule(BaseTest):
     def test_state_machine_with_schedule(self):
         self.create_and_verify_stack("combination/state_machine_with_schedule")
diff --git a/integration/config/service_names.py b/integration/config/service_names.py
@@ -26,6 +26,10 @@
 S3_EVENTS = "S3Events"
 SELF_MANAGED_KAFKA = "SelfManagedKafka"
 SECRET_MANAGER = "SecretsManager"
-STATE_MACHINE = "StepFunctions"
+STATE_MACHINE_INLINE_DEFINITION = "StateMachineInlineDefinition"
+STATE_MACHINE_CWE_CWS = "StateMachineCweCws"
+STATE_MACHINE_WITH_APIS = "StateMachineWithApis"
 LAMBDA_URL = "LambdaUrl"
+LAMBDA_ENV_VARS = "LambdaEnvVars"
 EVENT_INVOKE_CONFIG = "EventInvokeConfig"
+EPHEMERAL_STORAGE = "EphemeralStorage"
diff --git a/integration/single/test_basic_function.py b/integration/single/test_basic_function.py
@@ -3,7 +3,16 @@
 
 import pytest
 
-from integration.config.service_names import KMS, XRAY, ARM, CODE_DEPLOY, HTTP_API
+from integration.config.service_names import (
+    EVENT_INVOKE_CONFIG,
+    KMS,
+    LAMBDA_URL,
+    XRAY,
+    ARM,
+    CODE_DEPLOY,
+    HTTP_API,
+    EPHEMERAL_STORAGE,
+)
 from integration.helpers.resource import current_region_does_not_support
 from parameterized import parameterized
 from integration.helpers.base_test import BaseTest
@@ -77,7 +86,7 @@ def test_basic_function_with_architecture(self, file_name, architecture):
             ("single/basic_function_with_function_url_with_autopuplishalias", "live"),
         ]
     )
-    @skipIf(current_region_does_not_support(["Url"]), "Url is not supported in this testing region")
+    @skipIf(current_region_does_not_support([LAMBDA_URL]), "Lambda Url is not supported in this testing region")
     def test_basic_function_with_url_config(self, file_name, qualifier):
         """
         Creates a basic lambda function with Function Url enabled
@@ -172,6 +181,10 @@ def test_basic_function_with_tags(self):
         self.assertTrue("TagKey2" in tags)
         self.assertEqual(tags["TagKey2"], "")
 
+    @skipIf(
+        current_region_does_not_support([EVENT_INVOKE_CONFIG]),
+        "EventInvokeConfig is not supported in this testing region",
+    )
     def test_basic_function_event_destinations(self):
         """
         Creates a basic lambda function with event destinations
@@ -250,6 +263,10 @@ def test_basic_function_with_tracing(self):
             "single/function_with_ephemeral_storage",
         ]
     )
+    @skipIf(
+        current_region_does_not_support([EPHEMERAL_STORAGE]),
+        "Lambda ephemeral storage is not supported in this testing region",
+    )
     def test_function_with_ephemeral_storage(self, file_name):
         """
         Creates a basic function with ephemeral storage
diff --git a/integration/single/test_basic_state_machine.py b/integration/single/test_basic_state_machine.py
@@ -2,20 +2,25 @@
 
 from integration.helpers.base_test import BaseTest
 from integration.helpers.resource import current_region_does_not_support
+from integration.config.service_names import XRAY, STATE_MACHINE_INLINE_DEFINITION
 
 
 class TestBasicLayerVersion(BaseTest):
     """
     Basic AWS::Serverless::StateMachine tests
     """
 
+    @skipIf(
+        current_region_does_not_support([STATE_MACHINE_INLINE_DEFINITION]),
+        "StateMachine with inline definition is not supported in this testing region",
+    )
     def test_basic_state_machine_inline_definition(self):
         """
         Creates a State Machine from inline definition
         """
         self.create_and_verify_stack("single/basic_state_machine_inline_definition")
 
-    @skipIf(current_region_does_not_support(["XRay"]), "XRay is not supported in this testing region")
+    @skipIf(current_region_does_not_support([XRAY]), "XRay is not supported in this testing region")
     def test_basic_state_machine_with_tags(self):
         """
         Creates a State Machine with tags
