comparison 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
comparison
equal deleted inserted replaced
141:5de178abe4d8 142:6d2bfbbd0c2d
98 _REMOTE['Server'], str(_REMOTE['DicomPort']) ] + args, 98 _REMOTE['Server'], str(_REMOTE['DicomPort']) ] + args,
99 stderr=subprocess.PIPE) 99 stderr=subprocess.PIPE)
100 return p.communicate()[1] 100 return p.communicate()[1]
101 101
102 102
103 def GetMoveScuCommand():
104 return [
105 FindExecutable('movescu'),
106 '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp)
107 '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc)
108 '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp)
109 _REMOTE['Server'],
110 str(_REMOTE['DicomPort'])
111 ]
112
103 def CallMoveScu(args): 113 def CallMoveScu(args):
104 subprocess.check_call([ FindExecutable('movescu'), 114 subprocess.check_call(GetMoveScuCommand() + args,
105 '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp)
106 '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc)
107 '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp)
108 _REMOTE['Server'], str(_REMOTE['DicomPort']) ] + args,
109 stderr=subprocess.PIPE) 115 stderr=subprocess.PIPE)
110 116
111 117
112 118
113 def GenerateTestSequence(): 119 def GenerateTestSequence():