Skip to content

Commit c2f0afa

Browse files
committed
Disable failover tests based on conditions
1 parent 7d51623 commit c2f0afa

2 files changed

Lines changed: 19 additions & 4 deletions

File tree

tests/integration/container/test_aws_secrets_manager.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
from aws_advanced_python_wrapper.errors import (AwsWrapperError,
2424
FailoverSuccessError)
2525
from aws_advanced_python_wrapper.utils.properties import Properties
26-
from .utils.conditions import enable_on_features
26+
from .utils.conditions import (disable_on_features, enable_on_deployments,
27+
enable_on_features, enable_on_num_instances)
28+
from .utils.database_engine_deployment import DatabaseEngineDeployment
2729
from .utils.driver_helper import DriverHelper
2830
from .utils.rds_test_utility import RdsTestUtility
2931
from .utils.test_environment import TestEnvironment
@@ -196,7 +198,12 @@ def test_incorrect_region(self, test_driver, conn_utils, create_secret, props):
196198
) as conn:
197199
conn.cursor()
198200

199-
@enable_on_features([TestEnvironmentFeatures.FAILOVER_SUPPORTED])
201+
@enable_on_num_instances(min_instances=2)
202+
@enable_on_deployments([DatabaseEngineDeployment.AURORA, DatabaseEngineDeployment.RDS_MULTI_AZ_CLUSTER])
203+
@disable_on_features([TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY,
204+
TestEnvironmentFeatures.BLUE_GREEN_DEPLOYMENT,
205+
TestEnvironmentFeatures.PERFORMANCE])
206+
@enable_on_features([TestEnvironmentFeatures.FAILOVER_SUPPORTED, TestEnvironmentFeatures.IAM])
200207
def test_failover_with_secrets_manager(
201208
self, test_driver, props, conn_utils, create_secret):
202209
region = TestEnvironment.get_current().get_info().get_region()

tests/integration/container/test_iam_authentication.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@
3333
from aws_advanced_python_wrapper import AwsWrapperConnection
3434
from aws_advanced_python_wrapper.errors import (AwsWrapperError,
3535
FailoverSuccessError)
36-
from tests.integration.container.utils.conditions import (disable_on_features,
37-
enable_on_features)
36+
from tests.integration.container.utils.conditions import (
37+
disable_on_features, enable_on_deployments, enable_on_features,
38+
enable_on_num_instances)
39+
from tests.integration.container.utils.database_engine_deployment import \
40+
DatabaseEngineDeployment
3841
from tests.integration.container.utils.driver_helper import DriverHelper
3942
from tests.integration.container.utils.rds_test_utility import RdsTestUtility
4043
from tests.integration.container.utils.test_environment import TestEnvironment
@@ -127,6 +130,11 @@ def test_iam_valid_connection_properties_no_password(
127130

128131
self.validate_connection(target_driver_connect, **params, **props)
129132

133+
@enable_on_num_instances(min_instances=2)
134+
@enable_on_deployments([DatabaseEngineDeployment.AURORA, DatabaseEngineDeployment.RDS_MULTI_AZ_CLUSTER])
135+
@disable_on_features([TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY,
136+
TestEnvironmentFeatures.BLUE_GREEN_DEPLOYMENT,
137+
TestEnvironmentFeatures.PERFORMANCE])
130138
@enable_on_features([TestEnvironmentFeatures.FAILOVER_SUPPORTED, TestEnvironmentFeatures.IAM])
131139
def test_failover_with_iam(
132140
self, test_environment: TestEnvironment, test_driver: TestDriver, props, conn_utils):

0 commit comments

Comments
 (0)