Skip to content

Commit

Permalink
Merge branch 'develop' into autopep8-patches/mesmith75-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
mesmith75 authored Jun 3, 2024
2 parents 1bc47d6 + b39cc3d commit 797cb8c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions ganga/GangaDirac/Lib/Backends/DiracBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ def clearFileInfo(f):
outputfiles_foreach(j, DiracFile, lambda x: clearFileInfo(x))

@require_disk_space
@require_credential
def getOutputData(self, outputDir=None, names=None, force=False, ignoreMissing=False):
"""Retrieve data stored on SE to dir (default=job output workspace).
If names=None, then all outputdata is downloaded otherwise names should
Expand Down
3 changes: 2 additions & 1 deletion ganga/GangaDirac/test/Unit/Backends/TestDiracBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,8 @@ def fake_outputfiles_foreach(job, file_type, func):
assert db.removeOutputData() is None


def test_getOutputData(db, tmpdir):
def test_getOutputData(db, tmpdir, mocker):
mocker.patch('GangaCore.GPIDev.Credentials.credential_store')
from GangaDirac.Lib.Files.DiracFile import DiracFile

def fake_replicas(lfns):
Expand Down

0 comments on commit 797cb8c

Please sign in to comment.