From 1b0bf5aeaf541271a5fdeb306b9ede04e5dc9afb Mon Sep 17 00:00:00 2001
From: Simon Crowle <sgc@it-innovation.soton.ac.uk>
Date: Tue, 27 Mar 2018 12:12:16 +0100
Subject: [PATCH] Renames influx_db client fixture
get_db_client -> influx_db
---
clmctest/monitoring/conftest.py | 2 +-
clmctest/monitoring/test_simresults.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/clmctest/monitoring/conftest.py b/clmctest/monitoring/conftest.py
index ad4d96b..c351aa8 100644
--- a/clmctest/monitoring/conftest.py
+++ b/clmctest/monitoring/conftest.py
@@ -40,7 +40,7 @@ def streaming_sim_params(streaming_sim_config):
@pytest.fixture(params=[{'database': 'CLMCMetrics'}], scope='module')
-def get_db_client(streaming_sim_config, request):
+def influx_db(streaming_sim_config, request):
"""
Creates an Influx DB client for the CLMC metrics database
diff --git a/clmctest/monitoring/test_simresults.py b/clmctest/monitoring/test_simresults.py
index 73d984a..f05c102 100644
--- a/clmctest/monitoring/test_simresults.py
+++ b/clmctest/monitoring/test_simresults.py
@@ -25,13 +25,13 @@ class TestSimulation(object):
('SELECT count(*) FROM "CLMCMetrics"."autogen"."mpegdash_service_config" WHERE ipendpoint=\'adaptive_streaming_I1_apache2\'',
{"time" : "1970-01-01T00:00:00Z", "count_avg_running" : 3602, "count_avg_starting" : 3602, "count_avg_stopped" : 3602, "count_avg_stopping" : 3602, "count_running" : 3602, "count_starting" : 3602, "count_stopped" : 3602, "count_stopping" : 3602}),
])
- def test_simulation(self, query, expected_result, get_db_client, run_simulation_fixture):
+ def test_simulation(self, query, expected_result, influx_db, run_simulation_fixture):
"""
This is the entry point of the test. This method will be found and executed when the module is ran using pytest
:param query: the query to execute (value obtained from the pytest parameter decorator)
:param expected_result: the result expected from executing the query (value obtained from the pytest parameter decorator)
- :param get_db_client the import db client fixture - imported from contest.py
+ :param influx_db the import db client fixture - imported from contest.py
:param run_simulation_fixture: the imported fixture to use to generate the testing data - the return value of the fixture is not needed in this case
"""
@@ -40,7 +40,7 @@ class TestSimulation(object):
print("\n") # prints a blank line for formatting purposes
# the raise_errors=False argument is given so that we could actually test that the DB didn't return any errors instead of raising an exception
- query_result = get_db_client.query(query, raise_errors=False)
+ query_result = influx_db.query(query, raise_errors=False)
# test the error attribute of the result is None, that is no error is returned from executing the DB query
assert query_result.error is None, "An error was encountered while executing query {0}.".format(query)
--
GitLab