moved testing libraries into their own directory

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'

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:
+# vim: se ts=3:

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:
+# vim: se ts=3:

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

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 *
 

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