Skip to content

Commit b087fc2

Browse files
committed
fix(fixtures): delete shares and jobs before deleting workflow (#113)
1 parent e906ba3 commit b087fc2

1 file changed

Lines changed: 20 additions & 4 deletions

File tree

pytest_reana/fixtures.py

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ def sample_yadage_workflow_in_db(
788788
789789
Adds a sample yadage workflow in the DB.
790790
"""
791-
from reana_db.models import Workflow
791+
from reana_db.models import Workflow, UserWorkflow
792792

793793
workflow_id = uuid4()
794794
relative_workspace_path = build_workspace_path(
@@ -808,8 +808,12 @@ def sample_yadage_workflow_in_db(
808808
session.add(workflow)
809809
session.commit()
810810
yield workflow
811+
for job in workflow.jobs:
812+
session.delete(job)
811813
for resource in workflow.resources:
812814
session.delete(resource)
815+
for user_workflow in UserWorkflow.query.filter_by(workflow_id=workflow.id_):
816+
session.delete(user_workflow)
813817
session.delete(workflow)
814818
session.commit()
815819

@@ -829,7 +833,7 @@ def sample_yadage_workflow_in_db_owned_by_user1(
829833
830834
Adds a sample yadage workflow in the DB.
831835
"""
832-
from reana_db.models import Workflow
836+
from reana_db.models import Workflow, UserWorkflow
833837

834838
workflow_id = uuid4()
835839
relative_workspace_path = build_workspace_path(
@@ -849,8 +853,12 @@ def sample_yadage_workflow_in_db_owned_by_user1(
849853
session.add(workflow)
850854
session.commit()
851855
yield workflow
856+
for job in workflow.jobs:
857+
session.delete(job)
852858
for resource in workflow.resources:
853859
session.delete(resource)
860+
for user_workflow in UserWorkflow.query.filter_by(workflow_id=workflow.id_):
861+
session.delete(user_workflow)
854862
session.delete(workflow)
855863
session.commit()
856864

@@ -870,7 +878,7 @@ def sample_serial_workflow_in_db(
870878
871879
Adds a sample serial workflow in the DB.
872880
"""
873-
from reana_db.models import Workflow
881+
from reana_db.models import Workflow, UserWorkflow
874882

875883
workflow_id = uuid4()
876884
relative_workspace_path = build_workspace_path(
@@ -890,8 +898,12 @@ def sample_serial_workflow_in_db(
890898
session.add(workflow)
891899
session.commit()
892900
yield workflow
901+
for job in workflow.jobs:
902+
session.delete(job)
893903
for resource in workflow.resources:
894904
session.delete(resource)
905+
for user_workflow in UserWorkflow.query.filter_by(workflow_id=workflow.id_):
906+
session.delete(user_workflow)
895907
session.delete(workflow)
896908
session.commit()
897909

@@ -911,7 +923,7 @@ def sample_serial_workflow_in_db_owned_by_user1(
911923
912924
Adds a sample serial workflow in the DB.
913925
"""
914-
from reana_db.models import Workflow
926+
from reana_db.models import Workflow, UserWorkflow
915927

916928
workflow_id = uuid4()
917929
relative_workspace_path = build_workspace_path(
@@ -931,8 +943,12 @@ def sample_serial_workflow_in_db_owned_by_user1(
931943
session.add(workflow)
932944
session.commit()
933945
yield workflow
946+
for job in workflow.jobs:
947+
session.delete(job)
934948
for resource in workflow.resources:
935949
session.delete(resource)
950+
for user_workflow in UserWorkflow.query.filter_by(workflow_id=workflow.id_):
951+
session.delete(user_workflow)
936952
session.delete(workflow)
937953
session.commit()
938954

0 commit comments

Comments
 (0)