X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/224f384d411bb1b4cccc7165c55bb64fd5c695ad..607fe087f6167061714a524dd53cbbc21b974973:/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 e72f67dce4..cca51b8a43 100644 --- a/sdk/python/tests/run_test_server.py +++ b/sdk/python/tests/run_test_server.py @@ -1,6 +1,7 @@ -#!/usr/bin/env python - from __future__ import print_function +from __future__ import division +from builtins import str +from builtins import range import argparse import atexit import errno @@ -34,9 +35,19 @@ import arvados.config ARVADOS_DIR = os.path.realpath(os.path.join(MY_DIRNAME, '../../..')) SERVICES_SRC_DIR = os.path.join(ARVADOS_DIR, 'services') if 'GOPATH' in os.environ: + # Add all GOPATH bin dirs to PATH -- but insert them after the + # ruby gems bin dir, to ensure "bundle" runs the Ruby bundler + # command, not the golang.org/x/tools/cmd/bundle command. gopaths = os.environ['GOPATH'].split(':') - gobins = [os.path.join(path, 'bin') for path in gopaths] - os.environ['PATH'] = ':'.join(gobins) + ':' + os.environ['PATH'] + addbins = [os.path.join(path, 'bin') for path in gopaths] + newbins = [] + for path in os.environ['PATH'].split(':'): + newbins.append(path) + if os.path.exists(os.path.join(path, 'bundle')): + newbins += addbins + addbins = [] + newbins += addbins + os.environ['PATH'] = ':'.join(newbins) TEST_TMPDIR = os.path.join(ARVADOS_DIR, 'tmp') if not os.path.exists(TEST_TMPDIR): @@ -44,6 +55,7 @@ if not os.path.exists(TEST_TMPDIR): my_api_host = None _cached_config = {} +_cached_db_config = {} def find_server_pid(PID_PATH, wait=10): now = time.time() @@ -85,7 +97,7 @@ def kill_server_pid(pidfile, wait=10, passenger_root=False): # Use up to half of the +wait+ period waiting for "passenger # stop" to work. If the process hasn't exited by then, start # sending TERM signals. - startTERM += wait/2 + startTERM += wait//2 server_pid = None while now <= deadline and server_pid is None: @@ -108,6 +120,7 @@ def kill_server_pid(pidfile, wait=10, passenger_root=False): try: exited, _ = os.waitpid(server_pid, os.WNOHANG) if exited > 0: + _remove_pidfile(pidfile) return except OSError: # already exited, or isn't our child process @@ -121,6 +134,7 @@ def kill_server_pid(pidfile, wait=10, passenger_root=False): if error.errno == errno.ESRCH: # Thrown by os.getpgid() or os.kill() if the process # does not exist, i.e., our work here is done. + _remove_pidfile(pidfile) return raise time.sleep(0.1) @@ -130,6 +144,13 @@ def kill_server_pid(pidfile, wait=10, passenger_root=False): format(server_pid, pidfile, wait), file=sys.stderr) +def _remove_pidfile(pidfile): + try: + os.unlink(pidfile) + except: + if os.path.lexists(pidfile): + raise + def find_available_port(): """Return an IPv4 port number that is not in use right now. @@ -191,7 +212,7 @@ def _fifo2stderr(label): except OSError as error: if error.errno != errno.ENOENT: raise - os.mkfifo(fifo, 0700) + os.mkfifo(fifo, 0o700) subprocess.Popen( ['stdbuf', '-i0', '-oL', '-eL', 'sed', '-e', 's/^/['+label+'] /', fifo], stdout=sys.stderr) @@ -219,8 +240,9 @@ def run(leave_running_atexit=False): # This will clear cached docs that belong to other processes (like # concurrent test suites) even if they're still running. They should # be able to tolerate that. - for fn in glob.glob(os.path.join(arvados.http_cache('discovery'), - '*,arvados,v1,rest,*')): + for fn in glob.glob(os.path.join( + str(arvados.http_cache('discovery')), + '*,arvados,v1,rest,*')): os.unlink(fn) pid_file = _pidfile('api') @@ -284,10 +306,16 @@ def run(leave_running_atexit=False): os.makedirs(gitdir) subprocess.check_output(['tar', '-xC', gitdir, '-f', gittarball]) + # The nginx proxy isn't listening here yet, but we need to choose + # the wss:// port now so we can write the API server config file. + wss_port = find_available_port() + _setport('wss', wss_port) + port = find_available_port() env = os.environ.copy() env['RAILS_ENV'] = 'test' - env['ARVADOS_WEBSOCKETS'] = 'yes' + env['ARVADOS_TEST_WSS_PORT'] = str(wss_port) + env.pop('ARVADOS_WEBSOCKETS', None) env.pop('ARVADOS_TEST_API_HOST', None) env.pop('ARVADOS_API_HOST', None) env.pop('ARVADOS_API_HOST_INSECURE', None) @@ -360,6 +388,47 @@ def stop(force=False): kill_server_pid(_pidfile('api')) my_api_host = None +def run_ws(): + if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ: + return + stop_ws() + port = find_available_port() + conf = os.path.join(TEST_TMPDIR, 'ws.yml') + with open(conf, 'w') as f: + f.write(""" +Client: + APIHost: {} + Insecure: true +Listen: :{} +LogLevel: {} +Postgres: + host: {} + dbname: {} + user: {} + password: {} + sslmode: require + """.format(os.environ['ARVADOS_API_HOST'], + port, + ('info' if os.environ.get('ARVADOS_DEBUG', '') in ['','0'] else 'debug'), + _dbconfig('host'), + _dbconfig('database'), + _dbconfig('username'), + _dbconfig('password'))) + logf = open(_fifo2stderr('ws'), 'w') + ws = subprocess.Popen( + ["ws", "-config", conf], + stdin=open('/dev/null'), stdout=logf, stderr=logf, close_fds=True) + with open(_pidfile('ws'), 'w') as f: + f.write(str(ws.pid)) + _wait_until_port_listens(port) + _setport('ws', port) + return port + +def stop_ws(): + if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ: + return + kill_server_pid(_pidfile('ws')) + def _start_keep(n, keep_args): keep0 = tempfile.mkdtemp() port = find_available_port() @@ -368,7 +437,7 @@ def _start_keep(n, keep_args): "-listen=:{}".format(port), "-pid="+_pidfile('keep{}'.format(n))] - for arg, val in keep_args.iteritems(): + for arg, val in keep_args.items(): keep_cmd.append("{}={}".format(arg, val)) logf = open(_fifo2stderr('keep{}'.format(n)), 'w') @@ -394,8 +463,7 @@ def run_keep(blob_signing_key=None, enforce_permissions=False, num_servers=2): with open(os.path.join(TEST_TMPDIR, "keep.blob_signing_key"), "w") as f: keep_args['-blob-signing-key-file'] = f.name f.write(blob_signing_key) - if enforce_permissions: - keep_args['-enforce-permissions'] = 'true' + keep_args['-enforce-permissions'] = str(enforce_permissions).lower() with open(os.path.join(TEST_TMPDIR, "keep.data-manager-token-file"), "w") as f: keep_args['-data-manager-token-file'] = f.name f.write(auth_token('data_manager')) @@ -538,6 +606,7 @@ def stop_keep_web(): def run_nginx(): if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ: return + stop_nginx() nginxconf = {} nginxconf['KEEPWEBPORT'] = _getport('keep-web') nginxconf['KEEPWEBDLSSLPORT'] = find_available_port() @@ -546,6 +615,8 @@ def run_nginx(): nginxconf['KEEPPROXYSSLPORT'] = find_available_port() nginxconf['GITPORT'] = _getport('arv-git-httpd') nginxconf['GITSSLPORT'] = find_available_port() + nginxconf['WSPORT'] = _getport('ws') + nginxconf['WSSPORT'] = _getport('wss') nginxconf['SSLCERT'] = os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'self-signed.pem') nginxconf['SSLKEY'] = os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'self-signed.key') nginxconf['ACCESSLOG'] = _fifo2stderr('nginx_access_log') @@ -594,7 +665,15 @@ def _getport(program): except IOError: return 9 +def _dbconfig(key): + global _cached_db_config + if not _cached_db_config: + _cached_db_config = yaml.load(open(os.path.join( + SERVICES_SRC_DIR, 'api', 'config', 'database.yml'))) + return _cached_db_config['test'][key] + def _apiconfig(key): + global _cached_config if _cached_config: return _cached_config[key] def _load(f, required=True): @@ -648,13 +727,14 @@ class TestCaseWithServers(unittest.TestCase): original environment. """ MAIN_SERVER = None + WS_SERVER = None KEEP_SERVER = None KEEP_PROXY_SERVER = None KEEP_WEB_SERVER = None @staticmethod def _restore_dict(src, dest): - for key in dest.keys(): + for key in list(dest.keys()): if key not in src: del dest[key] dest.update(src) @@ -668,6 +748,7 @@ class TestCaseWithServers(unittest.TestCase): os.environ.pop('ARVADOS_EXTERNAL_CLIENT', None) for server_kwargs, start_func, stop_func in ( (cls.MAIN_SERVER, run, reset), + (cls.WS_SERVER, run_ws, stop_ws), (cls.KEEP_SERVER, run_keep, stop_keep), (cls.KEEP_PROXY_SERVER, run_keep_proxy, stop_keep_proxy), (cls.KEEP_WEB_SERVER, run_keep_web, stop_keep_web)): @@ -694,6 +775,7 @@ class TestCaseWithServers(unittest.TestCase): if __name__ == "__main__": actions = [ 'start', 'stop', + 'start_ws', 'stop_ws', 'start_keep', 'stop_keep', 'start_keep_proxy', 'stop_keep_proxy', 'start_keep-web', 'stop_keep-web', @@ -726,6 +808,10 @@ if __name__ == "__main__": print(host) elif args.action == 'stop': stop(force=('ARVADOS_TEST_API_HOST' not in os.environ)) + elif args.action == 'start_ws': + run_ws() + elif args.action == 'stop_ws': + stop_ws() elif args.action == 'start_keep': run_keep(enforce_permissions=args.keep_enforce_permissions, num_servers=args.num_keep_servers) elif args.action == 'stop_keep':