Mercurial > hg > orthanc-tests
diff Tests/Tests.py @ 142:6d2bfbbd0c2d
reorganization
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 12 Jul 2018 14:44:37 +0200 |
parents | 5de178abe4d8 |
children | 28d50ffac07d |
line wrap: on
line diff
--- a/Tests/Tests.py Thu Jul 12 14:27:03 2018 +0200 +++ b/Tests/Tests.py Thu Jul 12 14:44:37 2018 +0200 @@ -100,12 +100,18 @@ return p.communicate()[1] +def GetMoveScuCommand(): + return [ + FindExecutable('movescu'), + '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp) + '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc) + '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp) + _REMOTE['Server'], + str(_REMOTE['DicomPort']) + ] + def CallMoveScu(args): - subprocess.check_call([ FindExecutable('movescu'), - '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp) - '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc) - '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp) - _REMOTE['Server'], str(_REMOTE['DicomPort']) ] + args, + subprocess.check_call(GetMoveScuCommand() + args, stderr=subprocess.PIPE)