Minor updates to dev_servers.py and tests/postgresql_fixture.py to al…

…low parsing sqlalchemy.url in the ini file (e.g. development.ini) for the postgres port and temporary directory path

CHANGELOG.rst

@@ -9,9 +9,13 @@ Change Log
 11.21.1
 =======
 
-* Minor updates to dev_servers.py and tests/elasticsearch_fixture.py to allow
-  defining transport_port for elasticsearch, for localhost/dev purposes only,
-  to allow running (for example) both cgap-portal and smaht-portal simultaneously.
+* Minor changes to allow running (for example) both cgap-portal and smaht-portal
+  simultaneously locally, for localhost/dev purposes only:
+  -  Minor updates to dev_servers.py and tests/elasticsearch_fixture.py
+     to allow defining transport_port for elasticsearch.
+  -  Minor updates to dev_servers.py and tests/postgresql_fixture.py to allow
+     parsing sqlalchemy.url in the ini file (e.g. development.ini) for the
+     postgres port and temporary directory path.
 
 
 11.21.0

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicsnovault"
-version = "11.21.0.1b1"  # TODO: To become 11.21.1
+version = "11.21.0.1b2"  # TODO: To become 11.21.1
 description = "Storage support for 4DN Data Portals."
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"

snovault/tests/postgresql_fixture.py

@@ -56,7 +56,7 @@ def make_snovault_db_test_url(username=SNOVAULT_DB_TEST_USERNAME,
     return "postgresql://%s@%s:%s/%s%s" % (username, hostname, port, dbname, query_string)
 
 
-def server_process(datadir, prefix='', echo=False):
+def server_process(datadir, prefix='', echo=False, port=None):
 
     postgres_command = os.path.join(prefix, 'postgres')
 
@@ -66,7 +66,7 @@ def server_process(datadir, prefix='', echo=False):
         '-F',  # no fsync
         '-h', SNOVAULT_DB_TEST_HOSTNAME,
         '-k', datadir,
-        '-p', str(SNOVAULT_DB_TEST_PORT),
+        '-p', str(SNOVAULT_DB_TEST_PORT) if port is None else port,
     ]
     process = subprocess.Popen(
         command,