Merge "Adapt protocol and skip tests depending on config"
diff --git a/octavia_tempest_plugin/tests/scenario/v2/test_amphora.py b/octavia_tempest_plugin/tests/scenario/v2/test_amphora.py
index 4f1480c..165424b 100644
--- a/octavia_tempest_plugin/tests/scenario/v2/test_amphora.py
+++ b/octavia_tempest_plugin/tests/scenario/v2/test_amphora.py
@@ -31,6 +31,15 @@
"""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
def resource_setup(cls):
"""Setup resources needed by the tests."""
super(AmphoraScenarioTest, cls).resource_setup()
diff --git a/tox.ini b/tox.ini
index d7d9ddd..64afde0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 2.0
-envlist = py35,py27,pep8
+envlist = pep8
skipsdist = True
[testenv]