Run 3rd-party test suites without excess dependences
- each test method is parametrized with ENV_NAME to
get unique names in JUnit reports for different
configurations
Change-Id: I8db671d1687f287dc8ca97782cd7bbdf0eaef988
diff --git a/tcp_tests/fixtures/stacklight_fixtures.py b/tcp_tests/fixtures/stacklight_fixtures.py
index df0d516..4340847 100644
--- a/tcp_tests/fixtures/stacklight_fixtures.py
+++ b/tcp_tests/fixtures/stacklight_fixtures.py
@@ -23,7 +23,7 @@
@pytest.fixture(scope='function')
-def sl_actions(config, underlay, salt_deployed):
+def sl_actions(config, underlay_actions, salt_actions):
"""Fixture that provides various actions for K8S
:param config: fixture provides oslo.config
@@ -32,14 +32,14 @@
For use in tests or fixtures to deploy a custom K8S
"""
- return sl_manager.SLManager(config, underlay, salt_deployed)
+ return sl_manager.SLManager(config, underlay_actions, salt_actions)
@pytest.mark.revert_snapshot(ext.SNAPSHOT.stacklight_deployed)
@pytest.fixture(scope='function')
def stacklight_deployed(revert_snapshot, request, config,
- hardware, underlay, core_deployed,
- salt_deployed, sl_actions):
+ hardware, underlay, salt_deployed,
+ sl_actions, core_deployed):
"""Fixture to get or install SL services on environment
:param revert_snapshot: fixture that reverts snapshot that is specified