Merge "Skip amphora scenario test if provider is not set"
This commit is contained in:
commit
c9414e8419
|
@ -30,6 +30,15 @@ CONF = config.CONF
|
||||||
class AmphoraScenarioTest(test_base.LoadBalancerBaseTest):
|
class AmphoraScenarioTest(test_base.LoadBalancerBaseTest):
|
||||||
"""Test the amphora object API."""
|
"""Test the amphora object API."""
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def skip_checks(cls):
|
||||||
|
super(AmphoraScenarioTest, cls).skip_checks()
|
||||||
|
|
||||||
|
if CONF.load_balancer.provider not in ['amphora', 'octavia']:
|
||||||
|
raise cls.skipException("Amphora tests require provider 'amphora' "
|
||||||
|
"or 'octavia' (alias to 'amphora', "
|
||||||
|
" deprecated) set")
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def resource_setup(cls):
|
def resource_setup(cls):
|
||||||
"""Setup resources needed by the tests."""
|
"""Setup resources needed by the tests."""
|
||||||
|
|
Loading…
Reference in New Issue