[ARVADOS] updated: 1.3.0-2299-g162db4b03

[Git user]

Summary of changes:
 build/run-tests.sh                  |  2 +-
 sdk/python/tests/run_test_server.py | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

       via  162db4b03e17b449144bc259e3296f56681cfe7c (commit)
      from  37ab0eedec5eaf99c27b6b64fd04cc9248081713 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 162db4b03e17b449144bc259e3296f56681cfe7c
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Thu Feb 27 10:22:54 2020 -0500

    15954: Fix railsapi startup in run_test_server.py.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index fff095e6e..3bb3f0014 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -405,7 +405,7 @@ checkdiscoverydoc() {
     dd="https://${1}/discovery/v1/apis/arvados/v1/rest"
     if ! (set -o pipefail; curl -fsk "$dd" | grep -q ^{ ); then
         echo >&2 "ERROR: could not retrieve discovery doc from RailsAPI at $dd"
-        tail -v $WORKSPACE/services/api/log/test.log
+        tail -v $WORKSPACE/tmp/railsapi.log
         return 1
     fi
     echo "${dd} ok"
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 5b75de08f..bca372ccd 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -327,9 +327,9 @@ def run(leave_running_atexit=False):
     env.pop('ARVADOS_API_HOST_INSECURE', None)
     env.pop('ARVADOS_API_TOKEN', None)
     logf = open(_logfilename('railsapi'), 'a')
-    start_msg = subprocess.check_output(
+    railsapi = subprocess.Popen(
         ['bundle', 'exec',
-         'passenger', 'start', '-d', '-p{}'.format(port),
+         'passenger', 'start', '-p{}'.format(port),
          '--pid-file', pid_file,
          '--log-file', '/dev/stdout',
          '--ssl',
@@ -340,11 +340,7 @@ def run(leave_running_atexit=False):
     if not leave_running_atexit:
         atexit.register(kill_server_pid, pid_file, passenger_root=api_src_dir)
 
-    match = re.search(r'Accessible via: https://(.*?)/', start_msg)
-    if not match:
-        raise Exception(
-            "Passenger did not report endpoint: {}".format(start_msg))
-    my_api_host = match.group(1)
+    my_api_host = "127.0.0.1:"+str(port)
     os.environ['ARVADOS_API_HOST'] = my_api_host
 
     # Make sure the server has written its pid file and started

-----------------------------------------------------------------------


hooks/post-receive
--