[ARVADOS] updated: 1.3.0-620-g53647be00

[Git user]

Summary of changes:
 build/run-tests.sh                  | 3 ++-
 sdk/python/tests/run_test_server.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

       via  53647be00773d583a6087f8c91e35df0f4f42bc8 (commit)
      from  ecfc7ea6083b01e058d780144da459d35b6bf323 (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 53647be00773d583a6087f8c91e35df0f4f42bc8
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Mar 29 13:36:51 2019 -0400

    15044: Don't kill run-tests's keepproxy server in sdk/python tests.
    
    This was causing an apps/workbench test
    (CollectionUploadTest#test_Upload_non-empty_files) to fail when
    running after sdk/python tests.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 087889145..14ad8ac93 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -393,6 +393,7 @@ start_services() {
         && python sdk/python/tests/run_test_server.py start_arv-git-httpd \
         && python sdk/python/tests/run_test_server.py start_ws \
         && eval $(python sdk/python/tests/run_test_server.py start_nginx || echo "fail=1; false") \
+        && export ARVADOS_TEST_PROXY_SERVICES=1 \
         && (env | egrep ^ARVADOS) \
         || fail=1
     deactivate
@@ -410,7 +411,7 @@ stop_services() {
     if [[ -n "$all_services_stopped" ]]; then
         return
     fi
-    unset ARVADOS_TEST_API_HOST
+    unset ARVADOS_TEST_API_HOST ARVADOS_TEST_PROXY_SERVICES
     . "$VENVDIR/bin/activate" || return
     cd "$WORKSPACE" \
         && python sdk/python/tests/run_test_server.py stop_nginx \
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index a69a1d465..6687ca491 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -582,6 +582,7 @@ def stop_keep(num_servers=2):
 
 def run_keep_proxy():
     if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ:
+        os.environ["ARVADOS_KEEP_SERVICES"] = "http://localhost:{}".format(_getport('keepproxy'))
         return
     stop_keep_proxy()
 

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


hooks/post-receive
--