Mercurial > hg > orthanc-tests

comparison Tests/Run.py @ 30:1f8d1f64e5d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 02 Jul 2015 14:41:27 +0200
parents cbd6703ba4e7
children f2dcf96fec51
comparison
equal deleted inserted replaced
29:cbd6703ba4e7 30:1f8d1f64e5d1
85 subprocess.check_call([ 'Orthanc', '--config=%s' % CONFIG ]) 85 subprocess.check_call([ 'Orthanc', '--config=%s' % CONFIG ])
86 86
87 with open(CONFIG, 'rt') as f: 87 with open(CONFIG, 'rt') as f:
88 config = f.read() 88 config = f.read()
89 89
90 if args.docker and args.server == 'localhost':
91 args.server = GetDockerHostAddress()
92
90 config = re.sub(r'("StorageDirectory"\s*:)\s*".*?"', r'\1 "/tmp/OrthancStorage"', config) 93 config = re.sub(r'("StorageDirectory"\s*:)\s*".*?"', r'\1 "/tmp/OrthancStorage"', config)
91 config = re.sub(r'("IndexDirectory"\s*:)\s*".*?"', r'\1 "/tmp/OrthancStorage"', config) 94 config = re.sub(r'("IndexDirectory"\s*:)\s*".*?"', r'\1 "/tmp/OrthancStorage"', config)
92 config = re.sub(r'("DicomAet"\s*:)\s*".*?"', r'\1 "ORTHANCTEST"', config) 95 config = re.sub(r'("DicomAet"\s*:)\s*".*?"', r'\1 "ORTHANCTEST"', config)
93 config = re.sub(r'("DicomPort"\s*:)\s*.*?,', r'\1 5001,', config) 96 config = re.sub(r'("DicomPort"\s*:)\s*.*?,', r'\1 5001,', config)
94 config = re.sub(r'("HttpPort"\s*:)\s*.*?,', r'\1 5000,', config) 97 config = re.sub(r'("HttpPort"\s*:)\s*.*?,', r'\1 5000,', config)
106 'Orthanc', CONFIG, #'--verbose', 109 'Orthanc', CONFIG, #'--verbose',
107 #'/home/jodogne/Subversion/Orthanc/i/Orthanc', CONFIG, '--verbose' 110 #'/home/jodogne/Subversion/Orthanc/i/Orthanc', CONFIG, '--verbose'
108 ]) 111 ])
109 112
110 113
111 if args.docker:
112 localServer = GetDockerHostAddress()
113 else:
114 localServer = 'localhost'
115
116 LOCAL = DefineOrthanc(aet = 'ORTHANCTEST', 114 LOCAL = DefineOrthanc(aet = 'ORTHANCTEST',
117 server = localServer, 115 server = 'localhost',
118 dicomPort = 5001, 116 dicomPort = 5001,
119 restPort = 5000, 117 restPort = 5000,
120 username = 'alice', 118 username = 'alice',
121 password = 'orthanctest') 119 password = 'orthanctest')
122 120