summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiddharth Ravikumar <sravik@bgsu.edu>2015-08-24 14:02:20 -0400
committerSiddharth Ravikumar <sravik@bgsu.edu>2015-08-24 14:02:20 -0400
commit9f06e9e654338966ab73502cf25ce8df8010d557 (patch)
tree93b367f942170c91b65395654c53b93ee788cbe0
parentf6338fa3808e45ddf294ae13a3bbeb78b0202982 (diff)
combox.config: silo directory is expanded to its abs. path when no silo directory is given.
modified: combox/config.py modified: tests/utils.py
-rw-r--r--combox/config.py2
-rw-r--r--tests/utils.py2
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']