Improve tests

grycap · Feb 15, 2024 · 4a84264 · 4a84264
1 parent 05ff1c9
commit 4a84264
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 15 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -24,9 +24,8 @@ jobs:
       - name: Check code style
         run: pycodestyle --max-line-length=120 --ignore=E402,W504,W605,E722 . --exclude=doc
 
-      - name: Test with nose
-        #run: nosetests test/unit/connectors/*.py test/unit/*.py test/functional/*.py -v --stop --with-xunit --with-coverage --cover-erase --cover-xml --cover-package=IM,contextualization
-        run: python -m coverage run --source=. -m unittest discover -s test/unit -p '*.py'
+      - name: Unit tests
+        run: python -m coverage run --source=. -m unittest discover -v -s test/unit -p '*.py'
 
       - name: Generate XML coverage report
         run: python -m coverage xml

diff --git a/monitoring/probeim.py b/monitoring/probeim.py
@@ -40,7 +40,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class TimeOutExcetion(Exception):

diff --git a/test/functional/test_im.py b/test/functional/test_im.py
@@ -44,7 +44,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class TestIM(unittest.TestCase):

diff --git a/test/integration/QuickTestIM.py b/test/integration/QuickTestIM.py
@@ -44,7 +44,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class QuickTestIM(unittest.TestCase):

diff --git a/test/integration/TestIM.py b/test/integration/TestIM.py
@@ -47,7 +47,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class TestIM(unittest.TestCase):

diff --git a/test/integration/TestREST.py b/test/integration/TestREST.py
@@ -44,7 +44,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class TestIM(unittest.TestCase):

diff --git a/test/integration/TestREST_JSON.py b/test/integration/TestREST_JSON.py
@@ -43,7 +43,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class TestIM(unittest.TestCase):

diff --git a/test/unit/AppDBIS.py b/test/unit/AppDBIS.py
@@ -13,7 +13,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class TestAppDBIS(unittest.TestCase):

diff --git a/test/unit/SSH.py b/test/unit/SSH.py
@@ -26,7 +26,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class TestSSH(unittest.TestCase):

diff --git a/test/unit/Tosca.py b/test/unit/Tosca.py
@@ -37,7 +37,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class TestTosca(unittest.TestCase):

diff --git a/test/unit/connectors/CloudConn.py b/test/unit/connectors/CloudConn.py
@@ -58,4 +58,5 @@ def tearDown(self):
     def read_file_as_string(file_name):
         tests_path = os.path.dirname(os.path.abspath(__file__))
         abs_file_path = os.path.join(tests_path, file_name)
-        return open(abs_file_path, 'r').read()
+        with open(abs_file_path, 'r') as f:
+            return f.read()
diff --git a/test/unit/openid.py b/test/unit/openid.py
@@ -27,7 +27,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class TestOpenIDClient(unittest.TestCase):

diff --git a/test/unit/test_im_logic.py b/test/unit/test_im_logic.py
@@ -50,7 +50,8 @@
 def read_file_as_string(file_name):
     tests_path = os.path.dirname(os.path.abspath(__file__))
     abs_file_path = os.path.join(tests_path, file_name)
-    return open(abs_file_path, 'r').read()
+    with open(abs_file_path, 'r') as f:
+        return f.read()
 
 
 class TestIM(unittest.TestCase):