# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1531399477 -7200
# Node ID 6d2bfbbd0c2d7d485736f45dc579d25493b44dd9
# Parent  5de178abe4d8cc1ebbc7b6670215f330c50a25e6
reorganization

diff -r 5de178abe4d8 -r 6d2bfbbd0c2d Tests/Tests.py
--- 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)