6377: Missing application.yml is not an error.
authorTom Clegg <tom@curoverse.com>
Fri, 26 Jun 2015 15:19:54 +0000 (11:19 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 7 Jul 2015 20:43:09 +0000 (16:43 -0400)
sdk/python/tests/run_test_server.py

index b25bf6215a7a90fcea20ef63995ad026c75b5d3a..02f65e6caf47470928fbbe7fcbee2cafb490e817 100644 (file)
@@ -453,10 +453,13 @@ def _getport(program):
 def _apiconfig(key):
     if _cached_config:
         return _cached_config[key]
-    def _load(f):
-        return yaml.load(os.path.join(SERVICES_SRC_DIR, 'api', 'config', f))
+    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.load(fullpath)
     cdefault = _load('application.default.yml')
-    csite = _load('application.yml')
+    csite = _load('application.yml', required=False)
     _cached_config = {}
     for section in [cdefault.get('common',{}), cdefault.get('test',{}),
                     csite.get('common',{}), csite.get('test',{})]: