Skip to content

Commit c1da28f

Browse files
committed
Merge branch 'remove-s3-bucket-polling' of https://github.com/ssl-hep/ServiceX_frontend into remove-s3-bucket-polling
2 parents 04ae90c + 6d18ff3 commit c1da28f

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

servicex/query_core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ async def get_signed_url(
575575
for file in files:
576576
filename = file.filename
577577

578-
if filename != '' and filename not in files_seen:
578+
if filename != "" and filename not in files_seen:
579579
if signed_urls_only:
580580
download_tasks.append(
581581
loop.create_task(

servicex/servicex_adapter.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
class AuthorizationError(BaseException):
5050
pass
5151

52+
5253
@dataclass
5354
class ServiceXFile:
5455
filename: str

tests/test_servicex_adapter.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -509,12 +509,14 @@ async def test_get_authorization(servicex):
509509
@patch("servicex.servicex_adapter.ClientSession.get")
510510
async def test_get_transformation_results_success(get, servicex):
511511
get.return_value.__aenter__.return_value.status = 200
512-
get.return_value.__aenter__.return_value.json = AsyncMock(return_value={
513-
"results": [
514-
{"file-path": "file1.txt"},
515-
{"file-path": "file2.txt"},
516-
]
517-
})
512+
get.return_value.__aenter__.return_value.json = AsyncMock(
513+
return_value={
514+
"results": [
515+
{"file-path": "file1.txt"},
516+
{"file-path": "file2.txt"},
517+
]
518+
}
519+
)
518520

519521
print(get)
520522

tests/test_servicex_dataset.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,9 @@ async def test_submit(mocker):
208208
servicex.submit_transform = AsyncMock()
209209
servicex.submit_transform.return_value = {"request_id": '123-456-789"'}
210210

211-
servicex.get_transformation_results = AsyncMock(side_effect=[[file1], [file1, file2]])
211+
servicex.get_transformation_results = AsyncMock(
212+
side_effect=[[file1], [file1, file2]]
213+
)
212214

213215
servicex.get_transform_status = AsyncMock()
214216
servicex.get_transform_status.side_effect = [

0 commit comments

Comments
 (0)