diff options
| -rw-r--r-- | test/lib/__init__.py (renamed from test/testlib.py) | 5 | ||||
| -rwxr-xr-x | test/lib/data.py (renamed from test/data.py) | 0 | ||||
| -rw-r--r-- | test/lib/mock.py (renamed from test/mock.py) | 0 | ||||
| -rw-r--r-- | test/lib/mocks.py (renamed from test/mocks.py) | 0 | ||||
| -rw-r--r-- | test/lib/notify.py (renamed from test/notify.py) | 0 | ||||
| -rw-r--r-- | test/test_caps.py | 6 | ||||
| -rw-r--r-- | test/test_dispatcher_nb.py | 6 | ||||
| -rw-r--r-- | test/test_misc_interface.py | 4 | ||||
| -rwxr-xr-x | test/test_roster.py | 4 | ||||
| -rw-r--r-- | test/test_sessions.py | 4 |
10 files changed, 15 insertions, 14 deletions
diff --git a/test/testlib.py b/test/lib/__init__.py index 3682ba86a..3a1300e12 100644 --- a/test/testlib.py +++ b/test/lib/__init__.py @@ -1,10 +1,11 @@ import sys import os.path -gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') +gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../..') -# look for modules in the CWD, 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') # a temporary version of ~/.gajim for testing configdir = gajim_root + '/test/tmp' diff --git a/test/data.py b/test/lib/data.py index d7c19af5f..d7c19af5f 100755 --- a/test/data.py +++ b/test/lib/data.py diff --git a/test/mock.py b/test/lib/mock.py index 02b94b511..02b94b511 100644 --- a/test/mock.py +++ b/test/lib/mock.py diff --git a/test/mocks.py b/test/lib/mocks.py index 5790dbde6..5790dbde6 100644 --- a/test/mocks.py +++ b/test/lib/mocks.py diff --git a/test/notify.py b/test/lib/notify.py index f14100af3..f14100af3 100644 --- a/test/notify.py +++ b/test/lib/notify.py diff --git a/test/test_caps.py b/test/test_caps.py index 642da1cb8..3a2bddeba 100644 --- a/test/test_caps.py +++ b/test/test_caps.py @@ -1,8 +1,8 @@ # tests for capabilities and the capabilities cache import unittest -import testlib -testlib.setup_env() +import lib +lib.setup_env() from common import gajim from common import xmpp @@ -46,4 +46,4 @@ class TestCapsCache(unittest.TestCase): if __name__ == '__main__': unittest.main() -# vim: se ts=3:
\ No newline at end of file +# vim: se ts=3: diff --git a/test/test_dispatcher_nb.py b/test/test_dispatcher_nb.py index 552380242..1bf9cb2c6 100644 --- a/test/test_dispatcher_nb.py +++ b/test/test_dispatcher_nb.py @@ -1,8 +1,8 @@ # tests for xmpppy's dispatcher_nb.py import unittest -import testlib -testlib.setup_env() +import lib +lib.setup_env() from mock import Mock @@ -52,4 +52,4 @@ class TestDispatcherNB(unittest.TestCase): if __name__ == '__main__': unittest.main() -# vim: se ts=3:
\ No newline at end of file +# vim: se ts=3: diff --git a/test/test_misc_interface.py b/test/test_misc_interface.py index 5225e6ea0..709632bdb 100644 --- a/test/test_misc_interface.py +++ b/test/test_misc_interface.py @@ -1,8 +1,8 @@ # tests for the miscellaneous functions scattered throughout src/gajim.py import unittest -import testlib -testlib.setup_env() +import lib +lib.setup_env() from common import gajim from gajim import Interface diff --git a/test/test_roster.py b/test/test_roster.py index 6da8715f9..21a48a637 100755 --- a/test/test_roster.py +++ b/test/test_roster.py @@ -2,8 +2,8 @@ import unittest import time -import testlib -testlib.setup_env() +import lib +lib.setup_env() from data import * diff --git a/test/test_sessions.py b/test/test_sessions.py index 1669157d6..1699feee7 100644 --- a/test/test_sessions.py +++ b/test/test_sessions.py @@ -2,8 +2,8 @@ import unittest import time -import testlib -testlib.setup_env() +import lib +lib.setup_env() from common import gajim from common import xmpp |