Commit 19d22df5 authored by Gabriel Monnerat's avatar Gabriel Monnerat

added hack to join the full path

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@40397 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent bd7ea977
...@@ -6,7 +6,7 @@ from getopt import getopt, GetoptError ...@@ -6,7 +6,7 @@ from getopt import getopt, GetoptError
from time import sleep from time import sleep
from cloudooo.utils import socketStatus from cloudooo.utils import socketStatus
from ConfigParser import ConfigParser from ConfigParser import ConfigParser
from os import chdir, path, environ from os import chdir, path, environ, curdir
from subprocess import Popen from subprocess import Popen
ENVIRONMENT_PATH = path.abspath(path.dirname(__file__)) ENVIRONMENT_PATH = path.abspath(path.dirname(__file__))
...@@ -68,6 +68,8 @@ def run(): ...@@ -68,6 +68,8 @@ def run():
elif opt == "--cloudooo_runner": elif opt == "--cloudooo_runner":
cloudooo_runner = arg cloudooo_runner = arg
elif opt == "--server_cloudooo_conf": elif opt == "--server_cloudooo_conf":
if arg.startswith(curdir):
arg = path.join(path.abspath(curdir), arg)
server_cloudooo_conf = arg server_cloudooo_conf = arg
environ["server_cloudooo_conf"] = arg environ["server_cloudooo_conf"] = arg
elif opt == "--timeout_limit": elif opt == "--timeout_limit":
...@@ -78,7 +80,7 @@ def run(): ...@@ -78,7 +80,7 @@ def run():
from cloudoooTestCase import loadConfig, startFakeEnvironment, stopFakeEnvironment from cloudoooTestCase import loadConfig, startFakeEnvironment, stopFakeEnvironment
sys.path.append(ENVIRONMENT_PATH) sys.path.append(ENVIRONMENT_PATH)
config = ConfigParser() config = ConfigParser()
config.read(server_cloudooo_conf) config.read(server_cloudooo_conf)
openoffice_port = int(config.get("app:main", "openoffice_port")) openoffice_port = int(config.get("app:main", "openoffice_port"))
......
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