diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-15 21:48:58 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-15 21:48:58 (GMT) |
commit | 15882010491d9f2de6fb43f1c40d753b386c0e2b (patch) | |
tree | a30297d794cfc036c418cb375e8e2abea87908bc /devbot | |
parent | 51acf16dba34336bab96591c74235c87ef397e91 (diff) |
Fix unit tests
Diffstat (limited to 'devbot')
-rw-r--r-- | devbot/config.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/devbot/config.py b/devbot/config.py index 31e2d1f..9d11b2b 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -78,14 +78,14 @@ def setup(**kwargs): _load_plugins() global config_dir - config_dir = kwargs["config_dir"] + config_dir = kwargs.get("config_dir", None) global logs_dir logs_dir = kwargs["logs_dir"] _ensure_dir(logs_dir) global _prefs_path - _prefs_path = kwargs["prefs_path"] + _prefs_path = kwargs.get("prefs_path", None) global _source_dir _source_dir = kwargs["source_dir"] @@ -253,9 +253,12 @@ def _load_plugins(): imp.load_module(name, f, filename, desc) def _read_index(dir_name, extra=[]): - index_dir = os.path.join(config_dir, dir_name) files = extra[:] + if config_dir is None: + return files + + index_dir = os.path.join(config_dir, dir_name) with open(os.path.join(index_dir, "index.json")) as f: files.extend(json.load(f)) return [os.path.join(index_dir, json_file) for json_file in files] |