From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 22 Sep 2017 20:31:46 +0000 (-0400)
Subject: Use configured postgres port in arvados-ws config in tests.
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/refs/heads/pgport

Use configured postgres port in arvados-ws config in tests.

No issue #

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

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 57efb97c48..7adce69df3 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -407,6 +407,7 @@ Listen: :{}
 LogLevel: {}
 Postgres:
   host: {}
+  port: {}
   dbname: {}
   user: {}
   password: {}
@@ -415,6 +416,7 @@ Postgres:
                    port,
                    ('info' if os.environ.get('ARVADOS_DEBUG', '') in ['','0'] else 'debug'),
                    _dbconfig('host'),
+                   _dbconfig('port', 5432),
                    _dbconfig('database'),
                    _dbconfig('username'),
                    _dbconfig('password')))
@@ -670,12 +672,12 @@ def _getport(program):
     except IOError:
         return 9
 
-def _dbconfig(key):
+def _dbconfig(key, *args):
     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]
+    return _cached_db_config['test'].get(key, *args)
 
 def _apiconfig(key):
     global _cached_config