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/k8s_fixtures.py b/tcp_tests/fixtures/k8s_fixtures.py
index fee64cf..e581b86 100644
--- a/tcp_tests/fixtures/k8s_fixtures.py
+++ b/tcp_tests/fixtures/k8s_fixtures.py
@@ -24,7 +24,7 @@
@pytest.fixture(scope='function')
-def k8s_actions(config, underlay, salt_deployed):
+def k8s_actions(config, underlay_actions, salt_actions):
"""Fixture that provides various actions for K8S
:param config: fixture provides oslo.config
@@ -34,7 +34,7 @@
For use in tests or fixtures to deploy a custom K8S
"""
- return k8smanager.K8SManager(config, underlay, salt_deployed)
+ return k8smanager.K8SManager(config, underlay_actions, salt_actions)
@pytest.mark.revert_snapshot(ext.SNAPSHOT.k8s_deployed)
@@ -107,7 +107,7 @@
@pytest.fixture(scope='function')
-def k8s_logs(request, func_name, underlay, k8s_deployed):
+def k8s_logs(request, func_name, k8s_actions):
"""Finalizer to extract conformance logs
Usage:
@@ -156,16 +156,16 @@
files_to_extract = utils.extract_name_from_mark(
extract, 'files_to_extract')
for path in files_to_extract:
- k8s_deployed.extract_file_to_node(
+ k8s_actions.extract_file_to_node(
system=container_system, container=extract_from,
file_path=path)
else:
- k8s_deployed.extract_file_to_node()
+ k8s_actions.extract_file_to_node()
if merge_xunit:
path = utils.extract_name_from_mark(merge_xunit, 'path')
output = utils.extract_name_from_mark(merge_xunit, 'output')
- k8s_deployed.combine_xunit(path, output)
- k8s_deployed.download_k8s_logs(files)
+ k8s_actions.combine_xunit(path, output)
+ k8s_actions.download_k8s_logs(files)
request.addfinalizer(test_fin)