summaryrefslogtreecommitdiffstats
path: root/pykolab/tests/zpush/__init__.py
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-04-11 11:52:29 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-04-11 11:52:29 +0100
commita44f887e6609d46f39c6f4266a175dce1671d2a0 (patch)
tree18da56c093696b9017eec0d62be44ba25339c797 /pykolab/tests/zpush/__init__.py
parentde8818dd793a1b1caff98be0ff03fc3e032f9f92 (diff)
downloadpykolab-a44f887e6609d46f39c6f4266a175dce1671d2a0.tar.gz
Pull out auth and conf from becoming multi-instance all over the place. One of each suffices.
Clean up imap module, along with making the imap.cyrus module work better
Diffstat (limited to 'pykolab/tests/zpush/__init__.py')
-rw-r--r--pykolab/tests/zpush/__init__.py19
1 files changed, 8 insertions, 11 deletions
diff --git a/pykolab/tests/zpush/__init__.py b/pykolab/tests/zpush/__init__.py
index 6794725..62783f5 100644
--- a/pykolab/tests/zpush/__init__.py
+++ b/pykolab/tests/zpush/__init__.py
@@ -21,25 +21,22 @@ import imp
import os
import sys
-import pykolab.logger
+import pykolab
-from pykolab.conf import Conf
from pykolab.constants import *
from pykolab.tests.constants import *
+from pykolab.translate import _
-class ZpushTest(object):
- def __init__(self, conf=None):
- if conf:
- self.conf = conf
- else:
- self.conf = Conf()
- self.conf.finalize_conf()
+log = pykolab.getLogger('pykolab.tests.zpush')
+conf = pykolab.getConf()
+class ZpushTest(object):
+ def __init__(self):
self.tests = []
# Make sure we parse the [testing] section of the configuration file, if
# available.
- self.conf.set_options_from_testing_section()
+ conf.set_options_from_testing_section()
# Attempt to create a list of modules
for x in range(0,8):
@@ -52,7 +49,7 @@ class ZpushTest(object):
pass
for test in self.tests:
- exec("result = %s(self.conf)" %(test))
+ exec("result = %s()" %(test))
#name = "from pykolab.tests.zpush.test_%s import Test_%s" %(test_num,test_num)
#file, pathname, description = imp.find_module(name, sys.path)