14965: Tweak netstat usage.
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 12 Jul 2019 18:49:15 +0000 (14:49 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 12 Jul 2019 18:49:15 +0000 (14:49 -0400)
Only list listening sockets, since those are the ones we're looking
for. (-l, not -a)

Don't truncate IP/port numbers. (-W)

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

sdk/python/tests/run_test_server.py

index 510ffbeca98d1ef72e875fdc9103b20c20dd1e5f..20a6111dd1f58757a93aaff567dbbfdb1c9ca925 100644 (file)
@@ -190,7 +190,7 @@ def _wait_until_port_listens(port, timeout=10, warn=True):
         return
     deadline = time.time() + timeout
     while time.time() < deadline:
-        if re.search(r'\ntcp.*:'+str(port)+' .* LISTEN *\n', str(subprocess.check_output(['netstat', '-an']))):
+        if re.search(r'\ntcp.*:'+str(port)+' .* LISTEN *\n', str(subprocess.check_output(['netstat', '-Wln']))):
             return True
         time.sleep(0.1)
     if warn: