# HG changeset patch # User Sebastien Jodogne # Date 1435840887 -7200 # Node ID 1f8d1f64e5d167a7c23b0b8cd1ff8d8dc54f41ae # Parent cbd6703ba4e7a75b9bee0186d14874269b737a96 fix diff -r cbd6703ba4e7 -r 1f8d1f64e5d1 Tests/Run.py --- a/Tests/Run.py Thu Jul 02 14:35:10 2015 +0200 +++ b/Tests/Run.py Thu Jul 02 14:41:27 2015 +0200 @@ -87,6 +87,9 @@ with open(CONFIG, 'rt') as f: config = f.read() +if args.docker and args.server == 'localhost': + args.server = GetDockerHostAddress() + config = re.sub(r'("StorageDirectory"\s*:)\s*".*?"', r'\1 "/tmp/OrthancStorage"', config) config = re.sub(r'("IndexDirectory"\s*:)\s*".*?"', r'\1 "/tmp/OrthancStorage"', config) config = re.sub(r'("DicomAet"\s*:)\s*".*?"', r'\1 "ORTHANCTEST"', config) @@ -108,13 +111,8 @@ ]) -if args.docker: - localServer = GetDockerHostAddress() -else: - localServer = 'localhost' - LOCAL = DefineOrthanc(aet = 'ORTHANCTEST', - server = localServer, + server = 'localhost', dicomPort = 5001, restPort = 5000, username = 'alice',