14716: Updates run_test_server script to run keep-web without deprecated flags.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index 28445ecf90d7cb3674d0e351707ae3cc0c665402..b2ed1c1df9ebab9bd625461ffcd4616c866c7519 100644 (file)
--- 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 62ea8b319c70f9a7dba8b98787a4f2908b9da7f1..6384401396275390540845ece7c4e24db1589f49 100644 (file)
--- 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 0f8f1c5f818e2768168e4c71094a67c34fb4478e..6cad088bba53e255690338674f73309b80c01f05 100644 (file)
--- 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))