diff options
Diffstat (limited to 'test/lib/__init__.py')
| -rw-r--r-- | test/lib/__init__.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/lib/__init__.py b/test/lib/__init__.py index 2b99a7e23..4b5f8ca12 100644 --- a/test/lib/__init__.py +++ b/test/lib/__init__.py @@ -1,5 +1,5 @@ import sys -import os.path +import os import getopt use_x = True @@ -12,7 +12,8 @@ for o, a in opts: gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../..') -# look for modules in the CWD, then gajim/test/lib, then gajim/src, then everywhere else +# look for modules in the CWD, then gajim/test/lib, then gajim/src, +# then everywhere else sys.path.insert(1, gajim_root + '/src') sys.path.insert(1, gajim_root + '/test/lib') @@ -23,8 +24,6 @@ configdir = gajim_root + '/test/tmp' import __builtin__ __builtin__._ = lambda x: x -import os - def setup_env(): # wipe config directory if os.path.isdir(configdir): @@ -40,6 +39,9 @@ def setup_env(): # for some reason common.gajim needs to be imported before xmpppy? from common import gajim + import logging + logging.basicConfig() + gajim.DATA_DIR = gajim_root + '/data' gajim.use_x = use_x |