|
@@ -209,8 +209,8 @@ def test_is_submittable():
|
|
|
scenario.add_sequences({"sequence": [task]})
|
|
|
sequence = scenario.sequences["sequence"]
|
|
|
assert len(_SequenceManager._get_all()) == 1
|
|
|
- assert sequence.id not in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert scenario.id not in SubmittableStatusCache.submittable_id_datanodes
|
|
|
+ assert sequence.id not in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert scenario.id not in SubmittableStatusCache._submittable_id_datanodes
|
|
|
assert _SequenceManager._is_submittable(sequence)
|
|
|
assert _SequenceManager._is_submittable(sequence.id)
|
|
|
assert _ScenarioManager._is_submittable(scenario)
|
|
@@ -218,88 +218,88 @@ def test_is_submittable():
|
|
|
assert not _SequenceManager._is_submittable("SEQUENCE_temp_SCENARIO_scenario")
|
|
|
|
|
|
dn_1.edit_in_progress = True
|
|
|
- assert scenario.id in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert sequence.id in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert dn_1.id in SubmittableStatusCache.submittable_id_datanodes[scenario.id]
|
|
|
- assert dn_1.id in SubmittableStatusCache.submittable_id_datanodes[sequence.id]
|
|
|
- assert dn_1.id in SubmittableStatusCache.datanode_id_submittables
|
|
|
- assert scenario.id in SubmittableStatusCache.datanode_id_submittables[dn_1.id]
|
|
|
- assert sequence.id in SubmittableStatusCache.datanode_id_submittables[dn_1.id]
|
|
|
+ assert scenario.id in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert sequence.id in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert dn_1.id in SubmittableStatusCache._submittable_id_datanodes[scenario.id]
|
|
|
+ assert dn_1.id in SubmittableStatusCache._submittable_id_datanodes[sequence.id]
|
|
|
+ assert dn_1.id in SubmittableStatusCache._datanode_id_submittables
|
|
|
+ assert scenario.id in SubmittableStatusCache._datanode_id_submittables[dn_1.id]
|
|
|
+ assert sequence.id in SubmittableStatusCache._datanode_id_submittables[dn_1.id]
|
|
|
assert (
|
|
|
- SubmittableStatusCache.submittable_id_datanodes[scenario.id][dn_1.id] == f"DataNode {dn_1.id} is being edited."
|
|
|
+ SubmittableStatusCache._submittable_id_datanodes[scenario.id][dn_1.id] == f"DataNode {dn_1.id} is being edited"
|
|
|
)
|
|
|
assert (
|
|
|
- SubmittableStatusCache.submittable_id_datanodes[sequence.id][dn_1.id] == f"DataNode {dn_1.id} is being edited."
|
|
|
+ SubmittableStatusCache._submittable_id_datanodes[sequence.id][dn_1.id] == f"DataNode {dn_1.id} is being edited"
|
|
|
)
|
|
|
assert not _ScenarioManager._is_submittable(scenario)
|
|
|
assert not _SequenceManager._is_submittable(sequence)
|
|
|
assert not _SequenceManager._is_submittable(sequence.id)
|
|
|
|
|
|
dn_1.edit_in_progress = False
|
|
|
- assert scenario.id not in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert sequence.id not in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert dn_1.id not in SubmittableStatusCache.datanode_id_submittables
|
|
|
+ assert scenario.id not in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert sequence.id not in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert dn_1.id not in SubmittableStatusCache._datanode_id_submittables
|
|
|
assert _SequenceManager._is_submittable(sequence)
|
|
|
assert _SequenceManager._is_submittable(sequence.id)
|
|
|
assert _ScenarioManager._is_submittable(scenario)
|
|
|
|
|
|
dn_1.last_edit_date = None
|
|
|
dn_2.edit_in_progress = True
|
|
|
- assert scenario.id in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert sequence.id in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert dn_1.id in SubmittableStatusCache.submittable_id_datanodes[scenario.id]
|
|
|
- assert dn_1.id in SubmittableStatusCache.submittable_id_datanodes[sequence.id]
|
|
|
- assert dn_2.id in SubmittableStatusCache.submittable_id_datanodes[scenario.id]
|
|
|
- assert dn_2.id in SubmittableStatusCache.submittable_id_datanodes[sequence.id]
|
|
|
- assert dn_1.id in SubmittableStatusCache.datanode_id_submittables
|
|
|
- assert scenario.id in SubmittableStatusCache.datanode_id_submittables[dn_1.id]
|
|
|
- assert sequence.id in SubmittableStatusCache.datanode_id_submittables[dn_1.id]
|
|
|
- assert dn_2.id in SubmittableStatusCache.datanode_id_submittables
|
|
|
- assert scenario.id in SubmittableStatusCache.datanode_id_submittables[dn_2.id]
|
|
|
- assert sequence.id in SubmittableStatusCache.datanode_id_submittables[dn_2.id]
|
|
|
+ assert scenario.id in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert sequence.id in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert dn_1.id in SubmittableStatusCache._submittable_id_datanodes[scenario.id]
|
|
|
+ assert dn_1.id in SubmittableStatusCache._submittable_id_datanodes[sequence.id]
|
|
|
+ assert dn_2.id in SubmittableStatusCache._submittable_id_datanodes[scenario.id]
|
|
|
+ assert dn_2.id in SubmittableStatusCache._submittable_id_datanodes[sequence.id]
|
|
|
+ assert dn_1.id in SubmittableStatusCache._datanode_id_submittables
|
|
|
+ assert scenario.id in SubmittableStatusCache._datanode_id_submittables[dn_1.id]
|
|
|
+ assert sequence.id in SubmittableStatusCache._datanode_id_submittables[dn_1.id]
|
|
|
+ assert dn_2.id in SubmittableStatusCache._datanode_id_submittables
|
|
|
+ assert scenario.id in SubmittableStatusCache._datanode_id_submittables[dn_2.id]
|
|
|
+ assert sequence.id in SubmittableStatusCache._datanode_id_submittables[dn_2.id]
|
|
|
assert (
|
|
|
- SubmittableStatusCache.submittable_id_datanodes[scenario.id][dn_1.id] == f"DataNode {dn_1.id} is not written."
|
|
|
+ SubmittableStatusCache._submittable_id_datanodes[scenario.id][dn_1.id] == f"DataNode {dn_1.id} is not written"
|
|
|
)
|
|
|
assert (
|
|
|
- SubmittableStatusCache.submittable_id_datanodes[sequence.id][dn_1.id] == f"DataNode {dn_1.id} is not written."
|
|
|
+ SubmittableStatusCache._submittable_id_datanodes[sequence.id][dn_1.id] == f"DataNode {dn_1.id} is not written"
|
|
|
)
|
|
|
assert (
|
|
|
- SubmittableStatusCache.submittable_id_datanodes[scenario.id][dn_2.id] == f"DataNode {dn_2.id} is being edited."
|
|
|
+ SubmittableStatusCache._submittable_id_datanodes[scenario.id][dn_2.id] == f"DataNode {dn_2.id} is being edited"
|
|
|
)
|
|
|
assert (
|
|
|
- SubmittableStatusCache.submittable_id_datanodes[sequence.id][dn_2.id] == f"DataNode {dn_2.id} is being edited."
|
|
|
+ SubmittableStatusCache._submittable_id_datanodes[sequence.id][dn_2.id] == f"DataNode {dn_2.id} is being edited"
|
|
|
)
|
|
|
assert not _ScenarioManager._is_submittable(scenario)
|
|
|
assert not _SequenceManager._is_submittable(sequence)
|
|
|
assert not _SequenceManager._is_submittable(sequence.id)
|
|
|
|
|
|
dn_1.last_edit_date = datetime.now()
|
|
|
- assert scenario.id in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert sequence.id in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert dn_1.id not in SubmittableStatusCache.submittable_id_datanodes[scenario.id]
|
|
|
- assert dn_1.id not in SubmittableStatusCache.submittable_id_datanodes[sequence.id]
|
|
|
- assert dn_2.id in SubmittableStatusCache.submittable_id_datanodes[scenario.id]
|
|
|
- assert dn_2.id in SubmittableStatusCache.submittable_id_datanodes[sequence.id]
|
|
|
- assert dn_1.id not in SubmittableStatusCache.datanode_id_submittables
|
|
|
- assert dn_2.id in SubmittableStatusCache.datanode_id_submittables
|
|
|
- assert scenario.id in SubmittableStatusCache.datanode_id_submittables[dn_2.id]
|
|
|
- assert sequence.id in SubmittableStatusCache.datanode_id_submittables[dn_2.id]
|
|
|
+ assert scenario.id in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert sequence.id in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert dn_1.id not in SubmittableStatusCache._submittable_id_datanodes[scenario.id]
|
|
|
+ assert dn_1.id not in SubmittableStatusCache._submittable_id_datanodes[sequence.id]
|
|
|
+ assert dn_2.id in SubmittableStatusCache._submittable_id_datanodes[scenario.id]
|
|
|
+ assert dn_2.id in SubmittableStatusCache._submittable_id_datanodes[sequence.id]
|
|
|
+ assert dn_1.id not in SubmittableStatusCache._datanode_id_submittables
|
|
|
+ assert dn_2.id in SubmittableStatusCache._datanode_id_submittables
|
|
|
+ assert scenario.id in SubmittableStatusCache._datanode_id_submittables[dn_2.id]
|
|
|
+ assert sequence.id in SubmittableStatusCache._datanode_id_submittables[dn_2.id]
|
|
|
assert (
|
|
|
- SubmittableStatusCache.submittable_id_datanodes[scenario.id][dn_2.id] == f"DataNode {dn_2.id} is being edited."
|
|
|
+ SubmittableStatusCache._submittable_id_datanodes[scenario.id][dn_2.id] == f"DataNode {dn_2.id} is being edited"
|
|
|
)
|
|
|
assert (
|
|
|
- SubmittableStatusCache.submittable_id_datanodes[sequence.id][dn_2.id] == f"DataNode {dn_2.id} is being edited."
|
|
|
+ SubmittableStatusCache._submittable_id_datanodes[sequence.id][dn_2.id] == f"DataNode {dn_2.id} is being edited"
|
|
|
)
|
|
|
assert not _ScenarioManager._is_submittable(scenario)
|
|
|
assert not _SequenceManager._is_submittable(sequence)
|
|
|
assert not _SequenceManager._is_submittable(sequence.id)
|
|
|
|
|
|
dn_2.edit_in_progress = False
|
|
|
- assert scenario.id not in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert sequence.id not in SubmittableStatusCache.submittable_id_datanodes
|
|
|
- assert dn_2.id not in SubmittableStatusCache.submittable_id_datanodes[scenario.id]
|
|
|
- assert dn_2.id not in SubmittableStatusCache.submittable_id_datanodes[sequence.id]
|
|
|
- assert dn_2.id not in SubmittableStatusCache.datanode_id_submittables
|
|
|
+ assert scenario.id not in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert sequence.id not in SubmittableStatusCache._submittable_id_datanodes
|
|
|
+ assert dn_2.id not in SubmittableStatusCache._submittable_id_datanodes[scenario.id]
|
|
|
+ assert dn_2.id not in SubmittableStatusCache._submittable_id_datanodes[sequence.id]
|
|
|
+ assert dn_2.id not in SubmittableStatusCache._datanode_id_submittables
|
|
|
assert _ScenarioManager._is_submittable(scenario)
|
|
|
assert _SequenceManager._is_submittable(sequence)
|
|
|
assert _SequenceManager._is_submittable(sequence.id)
|
|
@@ -564,7 +564,11 @@ def test_sequence_notification_subscribe(mocker):
|
|
|
notify_2.__module__ = "notify_2"
|
|
|
# Mocking this because NotifyMock is a class that does not loads correctly when getting the sequence
|
|
|
# from the storage.
|
|
|
- mocker.patch.object(_utils, "_load_fct", side_effect=[notify_1, notify_1, notify_2, notify_2, notify_2, notify_2])
|
|
|
+ mocker.patch.object(
|
|
|
+ _utils,
|
|
|
+ "_load_fct",
|
|
|
+ side_effect=[notify_1, notify_1, notify_1, notify_2, notify_2, notify_2, notify_2, notify_2],
|
|
|
+ )
|
|
|
|
|
|
# test subscription
|
|
|
callback = mock.MagicMock()
|