From a44f887e6609d46f39c6f4266a175dce1671d2a0 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Mon, 11 Apr 2011 11:52:29 +0100 Subject: 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 --- pykolab/tests/zpush/test_000_001.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'pykolab/tests/zpush/test_000_001.py') diff --git a/pykolab/tests/zpush/test_000_001.py b/pykolab/tests/zpush/test_000_001.py index c7bfbb6..204aba3 100644 --- a/pykolab/tests/zpush/test_000_001.py +++ b/pykolab/tests/zpush/test_000_001.py @@ -17,11 +17,16 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -from pykolab.conf import Conf +import pykolab + +from pykolab import utils from pykolab.constants import * from pykolab.tests.constants import * from pykolab.translate import _ +log = pykolab.getLogger('pykolab.tests.zpush') +conf = pykolab.getConf() + class Test_000_001(object): """ First, basic test. @@ -34,12 +39,6 @@ class Test_000_001(object): self.suite_num = "000" self.suite_test_num = "001" - if not conf: - self.conf = Conf() - self.conf.finalize_conf() - else: - self.conf = conf - # Create some test calendar items for item in TEST_ITEMS: try: -- cgit v1.1