From 24b54e7e8fdbaed2c806cfdd30377ff5d0f37765 Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Tue, 29 May 2018 16:13:35 +0100
Subject: [PATCH] set test package back to clmctest so the module can be
installed, added delay to the test_e2eresults.py so that the aggregator has
time to process the final measurements
---
clmctest/monitoring/test_e2eresults.py | 6 ++++--
setup.py | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/clmctest/monitoring/test_e2eresults.py b/clmctest/monitoring/test_e2eresults.py
index fea3a77..18f2f81 100644
--- a/clmctest/monitoring/test_e2eresults.py
+++ b/clmctest/monitoring/test_e2eresults.py
@@ -55,7 +55,7 @@ class TestE2ESimulation(object):
e2e_simulator.run()
print("Waiting for INFLUX to finish receiving simulation data...")
- time.sleep(e2e_simulator.SIMULATION_LENGTH) # wait for data to finish arriving at the INFLUX database
+ time.sleep(e2e_simulator.SIMULATION_LENGTH+10) # wait for data to finish arriving at the INFLUX database
print("... simulation data fixture finished")
print("... stopping aggregator")
@@ -95,6 +95,8 @@ class TestE2ESimulation(object):
# get the dictionary of result points; the next() function just gets the first element of the query results generator (we only expect one item in the generator)
actual_result = next(query_result.get_points())
+ print("expected_result == actual_result {0}, {1}".format(expected_result, actual_result))
+
assert expected_result == actual_result, "E2E Simulation test failure"
- print("Successfully passed test for the following query: {0}".format(query))
+
diff --git a/setup.py b/setup.py
index ae4a06e..191d3db 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ def get_version(fname):
setup(
- name = "clmc",
+ name = "clmctest",
version = get_version("clmctest/_version.py"),
author = "Michael Boniface",
author_email = "mjb@it-innovation.soton.ac.uk",
--
GitLab