Report Fileset Complete Even If Dataset is Empty (#19)

* Remove unused preflight assertion

* Report fileset complete even if there are no files in the dataset

Author: BenGalewsky

src/servicex_did_finder_lib/communication.py

@@ -42,19 +42,19 @@ async def run_file_fetch_loop(did: str, servicex: ServiceXAdapter, info: Dict[st
     if summary.file_count == 0:
         servicex.post_status_update(f'DID Finder found zero files for dataset {did}',
                                     severity='fatal')
-    else:
-        elapsed_time = int((datetime.now()-start_time).total_seconds())
-        servicex.put_fileset_complete(
-            {
-                "files": summary.file_count,
-                "files-skipped": summary.files_skipped,
-                "total-events": summary.total_events,
-                "total-bytes": summary.total_bytes,
-                "elapsed-time": elapsed_time,
-            }
-        )
-
-        servicex.post_status_update(f'Completed load of file in {elapsed_time} seconds')
+
+    elapsed_time = int((datetime.now()-start_time).total_seconds())
+    servicex.put_fileset_complete(
+        {
+            "files": summary.file_count,
+            "files-skipped": summary.files_skipped,
+            "total-events": summary.total_events,
+            "total-bytes": summary.total_bytes,
+            "elapsed-time": elapsed_time,
+        }
+    )
+
+    servicex.post_status_update(f'Completed load of file in {elapsed_time} seconds')
 
 
 def rabbit_mq_callback(user_callback: UserDIDHandler, channel, method, properties, body,

tests/servicex_did_finder_lib/test_communication.py

@@ -158,7 +158,8 @@ async def my_callback(did_name: str, info: Dict[str, Any]) \
 
     # Make sure the file was sent along, along with the completion
     SXAdaptor.put_file_add.assert_not_called()
-    SXAdaptor.put_fileset_complete.assert_not_called()
+    SXAdaptor.put_fileset_complete.assert_called_once()
+    assert SXAdaptor.put_fileset_complete.call_args[0][0]['files'] == 0
     SXAdaptor.post_status_update.assert_any_call(ANY, severity='fatal')
 
 
@@ -265,12 +266,11 @@ async def my_user_callback(did, info):
             yield v
 
     await run_file_fetch_loop("123-456", SXAdaptor, {}, my_user_callback)
-    SXAdaptor.post_preflight_check.assert_not_called
 
     assert SXAdaptor.put_file_add.assert_not_called
-    SXAdaptor.put_fileset_complete.assert_not_called
+    SXAdaptor.put_fileset_complete.assert_called_once()
 
-    assert SXAdaptor.post_status_update.call_args[0][0] == \
+    assert SXAdaptor.post_status_update.call_args_list[0][0][0] == \
         'DID Finder found zero files for dataset 123-456'
 
-    assert SXAdaptor.post_status_update.call_args[1]['severity'] == 'fatal'
+    assert SXAdaptor.post_status_update.call_args_list[0][1]['severity'] == 'fatal'