From 9f06e9e654338966ab73502cf25ce8df8010d557 Mon Sep 17 00:00:00 2001 From: Siddharth Ravikumar Date: Mon, 24 Aug 2015 14:02:20 -0400 Subject: combox.config: silo directory is expanded to its abs. path when no silo directory is given. modified: combox/config.py modified: tests/utils.py --- combox/config.py | 2 +- tests/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/combox/config.py b/combox/config.py index af86b90..111707e 100644 --- a/combox/config.py +++ b/combox/config.py @@ -87,7 +87,7 @@ def config_cb(config_dir = path.join(expanduser("~"), '.combox'), if silo_dir: config_info['silo_dir'] = path.abspath(silo_dir) else: - config_info['silo_dir'] = config_dir + config_info['silo_dir'] = path.abspath(config_dir) config_info['topsecret'] = pass_func() diff --git a/tests/utils.py b/tests/utils.py index ef9f482..dc7a309 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -37,7 +37,7 @@ def get_input_func(): node_dir_1 = path.join('tests', 'shard-dir-1') # sample config info. - config_info = ['testbox', combox_dir, config_dir, '2', + config_info = ['testbox', combox_dir, '', '2', 'node-0', node_dir_0, '1024', 'node-1', node_dir_1, '1024'] -- cgit v1.2.3