Merge pull request #238 from simvue-io/hotfix/fix-env-ci

Fix CI system for tests requiring server connection
Update functional tests to match refactor

Author: kzscisoft

.github/workflows/test_client_macos.yml

@@ -22,5 +22,7 @@ jobs:
       run: python -m pip install poetry
     - name: Test with pytest
       run: |
+        export SIMVUE_URL=${{ secrets.SIMVUE_URL }}
+        export SIMVUE_TOKEN=${{ secrets.SIMVUE_TOKEN }}
         poetry install --all-extras
         poetry run pytest tests/unit/ tests/refactor/

.github/workflows/test_client_ubuntu.yml

@@ -27,6 +27,8 @@ jobs:
       run: python -m pip install poetry
     - name: Test with pytest
       run: |
+        export SIMVUE_URL=${{ secrets.SIMVUE_URL }}
+        export SIMVUE_TOKEN=${{ secrets.SIMVUE_TOKEN }}
         poetry install --all-extras
         poetry run pytest --cov --cov-report=xml tests/unit/ tests/refactor/
     - name: Upload coverage reports to Codecov

.github/workflows/test_client_windows.yml

@@ -22,5 +22,7 @@ jobs:
       run: python -m pip install poetry
     - name: Test with pytest
       run: |
+        export SIMVUE_URL=${{ secrets.SIMVUE_URL }}
+        export SIMVUE_TOKEN=${{ secrets.SIMVUE_TOKEN }}
         poetry install --all-extras
         poetry run pytest tests/unit/ tests/refactor/

tests/functional/test_artifacts_invalid.py

@@ -17,8 +17,8 @@ def test_get_artifact_invalid_run(self):
         client = Client()
         with self.assertRaises(Exception) as context:
             client.get_artifact(run, str(uuid.uuid4()))
-            
-        self.assertTrue('Run does not exist' in str(context.exception))
+        
+        self.assertTrue(any(i in str(context.exception) for i in ('Run does not exist', 'No such run')))
 
 if __name__ == '__main__':
     unittest.main()

tests/functional/test_get_alerts.py

@@ -10,8 +10,8 @@ class TestGetAlerts(unittest.TestCase):
     def test_get_alerts(self):
         """
         Create a run & two alerts, make one alert be triggered
-        If triggered_only is True, check that only the triggered alert is returned
-        IF triggered_only is False, check both alerts are returned
+        If critical_only is True, check that only the triggered alert is returned
+        IF critical_only is False, check both alerts are returned
         If names_only is False, check that full dictionary of information is returned
         """
         run = Run()
@@ -51,7 +51,7 @@ def test_get_alerts(self):
         self.assertEqual(triggered_alerts_full[0]["alert"]["name"], "value_above_1")
         self.assertEqual(triggered_alerts_full[0]["status"]["current"], "critical")
 
-        all_alerts_names = client.get_alerts(run_id, triggered_only=False)
+        all_alerts_names = client.get_alerts(run_id, critical_only=False)
         self.assertListEqual(all_alerts_names, ['value_above_1', 'value_below_1'])
 
         run.close()

tests/functional/test_run_execute_process.py

@@ -9,7 +9,7 @@ def test_monitor_processes(self):
         with Run(mode='offline') as _run:
             _run.init(f"test_exec_monitor_{uuid.uuid4()}")
             _run.add_process("process_1", "Hello world!", executable="echo", n=True)
-            _run.add_process("process_2", "bash", debug=True, c="'return 1'")
+            _run.add_process("process_2", "bash", debug=True, c="true")
             _run.add_process("process_3", "ls", "-ltr")
     def test_abort_all_processes(self):
         start_time = time.time()

tests/functional/test_run_folder_get_delete.py

@@ -23,7 +23,7 @@ def test_run_folder_find_delete(self):
         with self.assertRaises(Exception) as context:
             client.get_folder(folder)
 
-        self.assertTrue('Folder does not exist' in str(context.exception))
+        self.assertTrue(f"Folder '{folder}' does not exist" in str(context.exception))
 
 if __name__ == '__main__':
     unittest.main()

tests/functional/test_run_folder_metadata_find.py

@@ -28,7 +28,7 @@ def test_run_folder_metadata_find(self):
         with self.assertRaises(Exception) as context:
             client.get_folder(folder)
 
-        self.assertTrue('Folder does not exist' in str(context.exception))
+        self.assertTrue(f"Folder '{folder}' does not exist" in str(context.exception))
 
 if __name__ == '__main__':
     unittest.main()

tests/functional/test_run_metadata.py

@@ -19,7 +19,7 @@ def test_run_metadata(self):
         run.close()
 
         client = Client()
-        data = client.get_run(run.id, metadata=True)
+        data = client.get_run(run.id)
         self.assertEqual(data['metadata'], metadata)
 
         runs = client.delete_runs(folder)

tests/functional/test_run_metadata_update.py

@@ -20,7 +20,7 @@ def test_run_metadata_update(self):
         metadata['b'] = 2
 
         client = Client()
-        data = client.get_run(run.id, metadata=True)
+        data = client.get_run(run.id)
         self.assertEqual(data['metadata'], metadata)
 
         runs = client.delete_runs(folder)