From 2d9aa62499005abd47b5f2fa604f01d055480722 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Fri, 2 Aug 2019 12:26:08 -0300 Subject: [PATCH] 14716: Updates run_test_server script to run keep-web without deprecated flags. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- lib/config/deprecated.go | 2 +- sdk/go/arvados/config.go | 1 - sdk/python/tests/run_test_server.py | 6 +----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go index 28445ecf90..b2ed1c1df9 100644 --- a/lib/config/deprecated.go +++ b/lib/config/deprecated.go @@ -322,7 +322,7 @@ func (ldr *Loader) loadOldWebsocketConfig(cfg *arvados.Config) error { const defaultKeepWebConfigPath = "/etc/arvados/keep-web/keep-web.yml" type oldKeepWebConfig struct { - Client arvados.Client + Client *arvados.Client Listen string diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go index 62ea8b319c..6384401396 100644 --- a/sdk/go/arvados/config.go +++ b/sdk/go/arvados/config.go @@ -142,7 +142,6 @@ type Cluster struct { AdminNotifierEmailFrom string AutoAdminFirstUser bool AutoAdminUserWithEmail string - AnonymousUserToken string AutoSetupNewUsers bool AutoSetupNewUsersWithRepository bool AutoSetupNewUsersWithVmUUID string diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py index 0f8f1c5f81..6cad088bba 100644 --- a/sdk/python/tests/run_test_server.py +++ b/sdk/python/tests/run_test_server.py @@ -607,11 +607,7 @@ def run_keep_web(): env['ARVADOS_API_TOKEN'] = auth_token('anonymous') logf = open(_logfilename('keep-web'), 'a') keepweb = subprocess.Popen( - ['keep-web', - '-allow-anonymous', - '-attachment-only-host=download', - '-management-token=e687950a23c3a9bceec28c6223a06c79', - '-listen=:'+str(keepwebport)], + ['keep-web'], env=env, stdin=open('/dev/null'), stdout=logf, stderr=logf) with open(_pidfile('keep-web'), 'w') as f: f.write(str(keepweb.pid)) -- 2.30.2