projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15922-force-legacy-api-14'
[arvados.git]
/
sdk
/
python
/
tests
/
run_test_server.py
diff --git
a/sdk/python/tests/run_test_server.py
b/sdk/python/tests/run_test_server.py
index ccfa1c4825f7da33684d263f12ecf8b7387134eb..2e093b396dfa22991332368db61a8e9f5904a5d5 100644
(file)
--- a/
sdk/python/tests/run_test_server.py
+++ b/
sdk/python/tests/run_test_server.py
@@
-640,6
+640,7
@@
def run_nginx():
'-g', 'pid '+_pidfile('nginx')+';',
'-c', conffile],
env=env, stdin=open('/dev/null'), stdout=sys.stderr)
'-g', 'pid '+_pidfile('nginx')+';',
'-c', conffile],
env=env, stdin=open('/dev/null'), stdout=sys.stderr)
+ _wait_until_port_listens(nginxconf['CONTROLLERSSLPORT'])
def setup_config():
rails_api_port = find_available_port()
def setup_config():
rails_api_port = find_available_port()
@@
-716,9
+717,8
@@
def setup_config():
config = {
"Clusters": {
"zzzzz": {
config = {
"Clusters": {
"zzzzz": {
- "EnableBetaController14287": ('14287' in os.environ.get('ARVADOS_EXPERIMENTAL', '')),
"ManagementToken": "e687950a23c3a9bceec28c6223a06c79",
"ManagementToken": "e687950a23c3a9bceec28c6223a06c79",
- "SystemRootToken": auth_token('
data_manag
er'),
+ "SystemRootToken": auth_token('
system_us
er'),
"API": {
"RequestTimeout": "30s",
},
"API": {
"RequestTimeout": "30s",
},