Commit 79af07b5 authored by mouadh's avatar mouadh

Merge remote-tracking branch 'origin/rest_services' into rest_services

parents b0e89794 558111fe
...@@ -198,14 +198,9 @@ class ConfigParser: ...@@ -198,14 +198,9 @@ class ConfigParser:
:param cube_path: path to cube (csv folders) :param cube_path: path to cube (csv folders)
:param file_name: config file name (DEFAULT = cubes-config.xml) :param file_name: config file name (DEFAULT = cubes-config.xml)
""" """
if cube_path == None: if cube_path is None:
# for later tests with config file from os.path import expanduser
from tests.test_xmla_notox import RUNNING_TOX home_directory = expanduser("~")
if RUNNING_TOX:
home_directory = os.environ.get('HOME_DIR')
else:
from os.path import expanduser
home_directory = expanduser("~")
self.cube_path = os.path.join(home_directory, 'olapy-data', 'cubes') self.cube_path = os.path.join(home_directory, 'olapy-data', 'cubes')
else: else:
self.cube_path = cube_path self.cube_path = cube_path
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment