Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test/lib
diff options
context:
space:
mode:
authorAndré Apitzsch <git@apitzsch.eu>2017-08-12 03:39:55 +0300
committerAndré Apitzsch <git@apitzsch.eu>2017-08-18 20:48:48 +0300
commit56d002ce34b29e616c40f3005269ee4d157fc2c1 (patch)
tree3d80e6f79298300c6385be67fcd5125ee4d13c01 /test/lib
parent6d1c659b4b2189a71ca2c1b8efda9afdd6e060af (diff)
Fix test imports
Diffstat (limited to 'test/lib')
-rw-r--r--test/lib/__init__.py4
-rw-r--r--test/lib/gajim_mocks.py6
-rw-r--r--test/lib/notify.py4
3 files changed, 7 insertions, 7 deletions
diff --git a/test/lib/__init__.py b/test/lib/__init__.py
index f92d4c1ed..192b31844 100644
--- a/test/lib/__init__.py
+++ b/test/lib/__init__.py
@@ -14,7 +14,7 @@ gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../..')
# look for modules in the CWD, then gajim/test/lib, then gajim/gajim,
# then everywhere else
-sys.path.insert(1, gajim_root + '/gajim')
+sys.path.insert(1, gajim_root)
sys.path.insert(1, gajim_root + '/test/lib')
# a temporary version of ~/.gajim for testing
@@ -48,7 +48,7 @@ def setup_env():
gajim.use_x = use_x
if use_x:
- import gtkgui_helpers
+ from gajim import gtkgui_helpers
gtkgui_helpers.GUI_DIR = gajim_root + '/data/gui'
from gajim.gajim import GajimApplication
gajim.app = GajimApplication()
diff --git a/test/lib/gajim_mocks.py b/test/lib/gajim_mocks.py
index d0a5d058c..cea618347 100644
--- a/test/lib/gajim_mocks.py
+++ b/test/lib/gajim_mocks.py
@@ -3,10 +3,10 @@ Module with dummy classes for Gajim specific unit testing
'''
from mock import Mock
-from common import gajim
-from common import ged
+from gajim.common import gajim
+from gajim.common import ged
-from common.connection_handlers import ConnectionHandlers
+from gajim.common.connection_handlers import ConnectionHandlers
class MockConnection(Mock, ConnectionHandlers):
def __init__(self, account, *args):
diff --git a/test/lib/notify.py b/test/lib/notify.py
index 1478879d7..e903691c2 100644
--- a/test/lib/notify.py
+++ b/test/lib/notify.py
@@ -1,7 +1,7 @@
# mock notify module
-from common import gajim
-from common import ged
+from gajim.common import gajim
+from gajim.common import ged
notifications = []