From 7f9f7de959b4d31d3fb2b10bb356ec9e0bc95112 Mon Sep 17 00:00:00 2001
From: Nikolay Stanchev <ns17@it-innovation.soton.ac.uk>
Date: Thu, 21 Jun 2018 16:25:52 +0100
Subject: [PATCH] updated the coverage configuration file and removed redundant
code from aggregator
---
src/service/.coveragerc | 8 +++++++-
src/service/clmcservice/aggregation/aggregator.py | 12 ------------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/service/.coveragerc b/src/service/.coveragerc
index a3edc11..9f2b9ea 100644
--- a/src/service/.coveragerc
+++ b/src/service/.coveragerc
@@ -1,3 +1,9 @@
[run]
source = clmcservice
-omit = clmcservice/tests.py
+omit =
+ *test*
+ *__init__*
+ clmcservice\aggregation\influx_data_interface.py
+ clmcservice\configapi\views.py
+ clmcservice\whoamiapi\views.py
+# configapi\views and whoami\views are currently omitted since there is no implementation there, yet
\ No newline at end of file
diff --git a/src/service/clmcservice/aggregation/aggregator.py b/src/service/clmcservice/aggregation/aggregator.py
index 8b66ce8..1199562 100644
--- a/src/service/clmcservice/aggregation/aggregator.py
+++ b/src/service/clmcservice/aggregation/aggregator.py
@@ -223,23 +223,11 @@ class AggregatorThread(Thread):
self.aggregator.stop()
- def add_event_lock(self, event):
- """
- Auxiliary method to set a thread-safe event lock object to the aggregator (used for testing).
-
- :param event: the event lock object
- """
-
- setattr(self, 'event', event)
-
def run(self):
"""
The method to execute when the thread starts.
"""
- if hasattr(self, 'event'):
- self.event.set()
-
self.aggregator.run()
--
GitLab