Merge "Skip root state inherting scenario tests for Redis"

This commit is contained in:
Zuul 2018-03-16 05:42:13 +00:00 committed by Gerrit Code Review
commit c75d6705bc
3 changed files with 20 additions and 1 deletions

View File

@ -400,12 +400,18 @@ register(
# cluster_root_actions_groups, ]
)
# Redis instances does not support inherit root state from backups,
# so a customized root actions group is created, instance backuping
# and restoring tests will not be included.
redis_root_actions_groups = list(instance_create_groups)
redis_root_actions_groups.extend([groups.ROOT_ACTION_ENABLE,
groups.ROOT_ACTION_DISABLE])
register(
["redis_supported"],
single=[common_groups,
backup_groups,
configuration_groups,
root_actions_groups, ],
redis_root_actions_groups, ],
multi=[replication_promote_groups, ]
# multi=[cluster_actions_groups,
# cluster_negative_actions_groups,

View File

@ -78,6 +78,7 @@ class RootActionsEnableGroup(TestGroup):
@test(depends_on=[check_root_enabled])
def backup_root_enabled_instance(self):
"""Backup the root-enabled instance."""
self.test_runner.check_inherit_root_state_supported()
self.backup_runner.run_backup_create()
self.backup_runner.run_backup_create_completed()
@ -126,6 +127,7 @@ class RootActionsDisableGroup(TestGroup):
def backup_root_disabled_instance(self):
"""Backup the root-disabled instance."""
self.test_runner.check_root_disable_supported()
self.test_runner.check_inherit_root_state_supported()
self.backup_runner2.run_backup_create()
self.backup_runner2.run_backup_create_completed()

View File

@ -177,6 +177,10 @@ class RootActionsRunner(TestRunner):
"""Throw SkipTest if root-disable is not supported."""
pass
def check_inherit_root_state_supported(self):
"""Throw SkipTest if inherting root state is not supported."""
pass
class PerconaRootActionsRunner(RootActionsRunner):
@ -231,3 +235,10 @@ class CouchbaseRootActionsRunner(RootActionsRunner):
def run_delete_root(self):
raise SkipKnownBug(runners.BUG_WRONG_API_VALIDATION)
class RedisRootActionsRunner(RootActionsRunner):
def check_inherit_root_state_supported(self):
raise SkipTest("Redis instances does not inherit root state "
"from backups.")