Merge pull request #139 from ssl-hep:gordonwatts/issue118

Cached queries should not talk to the internet

Author: gordonwatts

servicex/servicex.py

@@ -283,7 +283,8 @@ async def _get_files(self, selection_query: str, data_type: str,
                     yield r
 
                 # Cache the final status
-                await self._update_query_status(client, request_id)
+                if cached_files is None:
+                    await self._update_query_status(client, request_id)
 
             except ServiceXUnknownRequestID as e:
                 self._cache.remove_query(query)

tests/test_servicex.py

@@ -778,8 +778,11 @@ async def test_download_cached_nonet(mocker):
     mock_cache = build_cache_mock(mocker, query_cache_return='123-455',
                                   files=[('f1', 'file1.root')])
     mock_logger = mocker.MagicMock(spec=log_adaptor)
-    mock_transform_status = mocker.Mock(side_effect=[(0, 2, 0)])
-    mock_servicex_adaptor = MockServiceXAdaptor(mocker, "123-456", mock_transform_status)
+    mock_bomb = mocker.Mock(side_effect=RuntimeError('should not be called'))
+    mock_servicex_adaptor = MockServiceXAdaptor(mocker, "XXX-XXX",
+                                                mock_transform_status=mock_bomb,
+                                                mock_query=mock_bomb,
+                                                mock_transform_query_status=mock_bomb)
     mock_minio_adaptor = MockMinioAdaptor(mocker, files=['one_minio_entry', 'two_minio_entry'])
     data_adaptor = mocker.MagicMock(spec=DataConverterAdaptor)
 
@@ -791,10 +794,6 @@ async def test_download_cached_nonet(mocker):
                             local_log=mock_logger)
     await ds.get_data_rootfiles_async('(valid qastle string')
 
-    # Check the the number of times we called for a transform is good.
-    mock_transform_status.submit_query.assert_not_called()
-    mock_transform_status.transform_status.assert_not_called()
-
 
 @pytest.mark.asyncio
 async def test_download_write_to_inmem_cache(mocker):