Fix failing tests

The-Academic-Observatory · Apr 22, 2024 · c5526bf · c5526bf
1 parent 63e6e5a
commit c5526bf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/...ry/platform/dags/load_workflows_legacy.py → ...rvatory/platform/dags/load_dags_legacy.py b/...ry/platform/dags/load_workflows_legacy.py → ...rvatory/platform/dags/load_dags_legacy.py
diff --git a/observatory-platform/observatory/platform/workflows/vm_workflow.py b/observatory-platform/observatory/platform/workflows/vm_workflow.py
@@ -16,14 +16,15 @@
 
 import logging
 from datetime import datetime
-from typing import Optional, Tuple, Union, List
+from typing import List, Optional, Tuple, Union
 
 import pendulum
 from airflow.models.dag import DAG
 from airflow.models.dagbag import DagBag
 from airflow.models.dagrun import DagRun
 from airflow.models.taskinstance import TaskInstance
 from airflow.utils.state import DagRunState
+from airflow.utils.trigger_rule import TriggerRule
 from croniter import croniter
 
 from observatory.platform.airflow import delete_old_xcoms, get_airflow_connection_password, send_slack_msg
@@ -220,7 +221,7 @@ def __init__(
         self.add_task(self.update_terraform_variable)
         self.add_task(self.run_terraform)
         self.add_task(self.check_run_status)
-        self.add_task(self.cleanup, trigger_rule="none_failed")
+        self.add_task(self.cleanup)
 
     def make_release(self, **kwargs) -> None:
         """Required for Workflow class.

diff --git a/tests/observatory/platform/test_observatory_environment.py b/tests/observatory/platform/test_observatory_environment.py
@@ -617,21 +617,22 @@ def test_assert_cleanup(self):
         """Test assert_cleanup"""
 
         with CliRunner().isolated_filesystem() as temp_dir:
-            workflow = os.path.join(temp_dir, "workflow")
+            workflow_folder = os.path.join(temp_dir, "workflow")
+            test_folder = os.path.join(workflow_folder, "test")
 
             # Make download, extract and transform folders
-            os.makedirs(workflow)
+            os.makedirs(test_folder)
 
             # Check that assertion is raised when folders exist
             test_case = ObservatoryTestCase()
             with self.assertRaises(AssertionError):
-                test_case.assert_cleanup(workflow)
+                test_case.assert_cleanup(workflow_folder)
 
             # Delete folders
-            os.rmdir(workflow)
+            os.rmdir(test_folder)
 
             # No error when folders deleted
-            test_case.assert_cleanup(workflow)
+            test_case.assert_cleanup(workflow_folder)
 
     def test_setup_mock_file_download(self):
         """Test mocking a file download"""

diff --git a/tests/observatory/platform/workflows/test_vm_create.py b/tests/observatory/platform/workflows/test_vm_create.py
@@ -163,27 +163,27 @@ def test_workflow_vm_already_on(self, m_tapi, m_list_workspace_vars):
                 with time_machine.travel(dag_run.start_date, tick=True):
                     # check dependencies
                     ti = env.run_task(workflow.check_dependencies.__name__)
-                    self.assertEqual(ti.state, State.SUCCESS)
+                    self.assertEqual(State.SUCCESS, ti.state)
 
                     # check vm state
                     ti = env.run_task(workflow.check_vm_state.__name__)
-                    self.assertEqual(ti.state, State.SUCCESS)
+                    self.assertEqual(State.SUCCESS, ti.state)
 
                     # update terraform variable
                     ti = env.run_task(workflow.update_terraform_variable.__name__)
-                    self.assertEqual(ti.state, State.SKIPPED)
+                    self.assertEqual(State.SKIPPED, ti.state)
 
                     # run terraform
                     ti = env.run_task(workflow.run_terraform.__name__)
-                    self.assertEqual(ti.state, State.SKIPPED)
+                    self.assertEqual(State.SKIPPED, ti.state)
 
                     # check run status
                     ti = env.run_task(workflow.check_run_status.__name__)
-                    self.assertEqual(ti.state, State.SKIPPED)
+                    self.assertEqual(State.SKIPPED, ti.state)
 
                     # cleanup
                     ti = env.run_task(workflow.cleanup.__name__)
-                    self.assertEqual(ti.state, State.SUCCESS)
+                    self.assertEqual(State.SKIPPED, ti.state)
 
     @patch("observatory.platform.workflows.vm_workflow.send_slack_msg")
     @patch("observatory.platform.workflows.vm_workflow.TerraformApi.get_run_details")