[ARVADOS] updated: 1.3.0-1338-g84058ef2f
Git user
git at public.curoverse.com
Wed Jul 24 20:25:25 UTC 2019
Summary of changes:
sdk/python/tests/run_test_server.py | 29 -----------------------------
1 file changed, 29 deletions(-)
via 84058ef2f2142a2ced249d2bc02e8556ae268c6e (commit)
from e190fb0f5337a6c5b5b782d70f0b48699d4f21d6 (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 84058ef2f2142a2ced249d2bc02e8556ae268c6e
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Wed Jul 24 16:25:06 2019 -0400
14717: Delete obsolete functions from run_test_server.py
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 437d85ef9..d168c0717 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -759,35 +759,6 @@ def stop_nginx():
def _pidfile(program):
return os.path.join(TEST_TMPDIR, program + '.pid')
-def _dbconfig(key):
- global _cached_db_config
- if not _cached_db_config:
- if "ARVADOS_CONFIG" in os.environ:
- _cached_db_config = list(yaml.safe_load(open(os.environ["ARVADOS_CONFIG"]))["Clusters"].values())[0]["PostgreSQL"]["Connection"]
- else:
- _cached_db_config = yaml.safe_load(open(os.path.join(
- SERVICES_SRC_DIR, 'api', 'config', 'database.yml')))["test"]
- _cached_db_config["dbname"] = _cached_db_config["database"]
- _cached_db_config["user"] = _cached_db_config["username"]
- return _cached_db_config[key]
-
-def _apiconfig(key):
- global _cached_config
- if _cached_config:
- return _cached_config[key]
- def _load(f, required=True):
- fullpath = os.path.join(SERVICES_SRC_DIR, 'api', 'config', f)
- if not required and not os.path.exists(fullpath):
- return {}
- return yaml.safe_load(fullpath)
- cdefault = _load('application.default.yml')
- csite = _load('application.yml', required=False)
- _cached_config = {}
- for section in [cdefault.get('common',{}), cdefault.get('test',{}),
- csite.get('common',{}), csite.get('test',{})]:
- _cached_config.update(section)
- return _cached_config[key]
-
def fixture(fix):
'''load a fixture yaml file'''
with open(os.path.join(SERVICES_SRC_DIR, 'api', "test", "fixtures",
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list