From 3b4058bf648d41b6715fc2c29d15ce367db178af Mon Sep 17 00:00:00 2001
From: Fabrice Le Goff <fabrice.le.goff@cern.ch>
Date: Tue, 20 Aug 2019 16:21:19 +0200
Subject: [PATCH] make pylint happy
---
UnitTests/TestSuite_Functional.py | 5 ++---
UnitTests/UnitTests/ERSThread_Test.py | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/UnitTests/TestSuite_Functional.py b/UnitTests/TestSuite_Functional.py
index d5f8523..755015e 100644
--- a/UnitTests/TestSuite_Functional.py
+++ b/UnitTests/TestSuite_Functional.py
@@ -1,14 +1,13 @@
import unittest
-from UnitTests.FunctionalTests import LocalCopy_Test, ERS_Test
+from UnitTests.FunctionalTests import LocalCopy_Test
suite = unittest.TestSuite()
loader = unittest.TestLoader()
suite.addTests(loader.loadTestsFromModule(LocalCopy_Test))
-suite.addTests(loader.loadTestsFromModule(ERS_Test))
runner = unittest.TextTestRunner(verbosity=3)
print("\n==============================================================")
print("Running Functional Tests:")
print("==============================================================\n")
-result = runner.run(suite)
\ No newline at end of file
+result = runner.run(suite)
diff --git a/UnitTests/UnitTests/ERSThread_Test.py b/UnitTests/UnitTests/ERSThread_Test.py
index 852d4cc..e8acbf5 100644
--- a/UnitTests/UnitTests/ERSThread_Test.py
+++ b/UnitTests/UnitTests/ERSThread_Test.py
@@ -4,7 +4,6 @@ import threading
import os
import logging
import sys
-from StringIO import StringIO
if __name__ == '__main__':
SCRIPT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../Script'))
@@ -17,9 +16,9 @@ class TestERSThread(unittest.TestCase):
base_file_name = 'ers_thread_test'
def instantiate_handler_and_log_all_severities(self):
- SCRIPT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../Script'))
+ base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../..'))
config = ConfigParser.ConfigHolder(
- os.path.join(SCRIPT_DIR, '../Configs/template.cfg'))
+ os.path.join(base_dir, 'Configs/template.cfg'))
# override some config values
config.ERSTimeout = 1
--
GitLab