@@ -36,16 +36,21 @@ def test_run(
3636 ispyb_session_id , dcg_result , dc_result , insert_data_collection = test_params
3737
3838 # Set up mock objects
39+ # 'get_session_id'
3940 mock_get_session_id = mocker .patch (
4041 "murfey.workflows.register_data_collection.get_session_id"
4142 )
4243 mock_get_session_id .return_value = ispyb_session_id
44+
45+ # Transport object inserts
4346 mock_transport_object = mocker .patch (
4447 "murfey.workflows.register_data_collection._transport_object"
4548 )
4649 mock_transport_object .do_insert_data_collection .return_value = {
4750 "return_value" : insert_data_collection
4851 }
52+
53+ # Murfey database
4954 mock_murfey_db = MagicMock ()
5055 mock_dcg = MagicMock ()
5156 mock_dcg .id = dcg_result
@@ -88,13 +93,12 @@ def test_run(
8893 if dc_result is None :
8994 if ispyb_session_id is not None :
9095 mock_transport_object .do_insert_data_collection .assert_called_once ()
91- if insert_data_collection is None :
92- assert result == {"success" : False , "requeue" : True }
93- else :
96+ if insert_data_collection is not None :
9497 assert result == {"success" : True }
98+ else :
99+ assert result == {"success" : False , "requeue" : True }
95100 else :
96101 mock_transport_object .do_insert_data_collection .assert_not_called ()
97-
98102 assert result == {"success" : False , "requeue" : True }
99103 else :
100104 assert result == {"success" : True }
0 commit comments