[ARVADOS] updated: 1.3.0-1174-g93db16f42

[Git user]

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

       via  93db16f42ed2f7f9a4e74ff24d9792655cf39923 (commit)
       via  e58f39be58ab352d19907079eeaf2fa9730c1bfe (commit)
      from  e12e22c0f55f1c4366b06d012addba44dbc5f7d8 (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 93db16f42ed2f7f9a4e74ff24d9792655cf39923
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jul 9 10:50:06 2019 -0400

    14965: Use netstat instead of lsof to check for listening process.
    
    `lsof -t -i tcp:1234` hangs if a zombie process exists on the system.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index fea0578ab..c845e78f0 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -181,22 +181,18 @@ def _wait_until_port_listens(port, timeout=10, warn=True):
     in seconds), print a warning on stderr before returning.
     """
     try:
-        subprocess.check_output(['which', 'lsof'])
+        subprocess.check_output(['which', 'netstat'])
     except subprocess.CalledProcessError:
-        print("WARNING: No `lsof` -- cannot wait for port to listen. "+
+        print("WARNING: No `netstat` -- cannot wait for port to listen. "+
               "Sleeping 0.5 and hoping for the best.",
               file=sys.stderr)
         time.sleep(0.5)
         return
     deadline = time.time() + timeout
     while time.time() < deadline:
-        try:
-            subprocess.check_output(
-                ['lsof', '-t', '-i', 'tcp:'+str(port)])
-        except subprocess.CalledProcessError:
-            time.sleep(0.1)
-            continue
-        return True
+        if re.search(r'\ntcp.*:'+str(port)+' .* LISTEN *\n', subprocess.check_output(['netstat', '-an'])):
+            return True
+        time.sleep(0.1)
     if warn:
         print(
             "WARNING: Nothing is listening on port {} (waited {} seconds).".

commit e58f39be58ab352d19907079eeaf2fa9730c1bfe
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jul 9 10:49:44 2019 -0400

    14965: Run py3 tests in the python3 virtualenv.
    
    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 79c531b29..ec4fec918 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -794,7 +794,10 @@ do_test_once() {
             tries=$((${tries}+1))
             # $3 can name a path directory for us to use, including trailing
             # slash; e.g., the bin/ subdirectory of a virtualenv.
-            "${3}python" setup.py ${short:+--short-tests-only} test ${testargs[$1]}
+            if [[ -e "${3}activate" ]]; then
+                . "${3}activate"
+            fi
+            python setup.py ${short:+--short-tests-only} test ${testargs[$1]}
             result=$?
             if [[ ${tries} < 3 && ${result} == 137 ]]
             then

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


hooks/post-receive
--