Mercurial > hg > orthanc-tests

comparison Tests/Run.py @ 29:cbd6703ba4e7

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:35:10 +0200
parents cde1691838d3
children 1f8d1f64e5d1
comparison
equal deleted inserted replaced
28:156c7ae164b5 29:cbd6703ba4e7
79 ## 79 ##
80 ## Generate the configuration file for the anciliary instance of 80 ## Generate the configuration file for the anciliary instance of
81 ## Orthanc 81 ## Orthanc
82 ## 82 ##
83 83
84 if args.docker:
85 args.server = GetDockerHostAddress()
86
87 CONFIG = '/tmp/IntegrationTestsConfiguration.json' 84 CONFIG = '/tmp/IntegrationTestsConfiguration.json'
88 subprocess.check_call([ 'Orthanc', '--config=%s' % CONFIG ]) 85 subprocess.check_call([ 'Orthanc', '--config=%s' % CONFIG ])
89 86
90 with open(CONFIG, 'rt') as f: 87 with open(CONFIG, 'rt') as f:
91 config = f.read() 88 config = f.read()
109 'Orthanc', CONFIG, #'--verbose', 106 'Orthanc', CONFIG, #'--verbose',
110 #'/home/jodogne/Subversion/Orthanc/i/Orthanc', CONFIG, '--verbose' 107 #'/home/jodogne/Subversion/Orthanc/i/Orthanc', CONFIG, '--verbose'
111 ]) 108 ])
112 109
113 110
111 if args.docker:
112 localServer = GetDockerHostAddress()
113 else:
114 localServer = 'localhost'
115
114 LOCAL = DefineOrthanc(aet = 'ORTHANCTEST', 116 LOCAL = DefineOrthanc(aet = 'ORTHANCTEST',
115 server = 'localhost', 117 server = localServer,
116 dicomPort = 5001, 118 dicomPort = 5001,
117 restPort = 5000, 119 restPort = 5000,
118 username = 'alice', 120 username = 'alice',
119 password = 'orthanctest') 121 password = 'orthanctest')
120 122