migrate from FeederComponent.handler to FeederComponent.tick_handlers

darcs-hash:20081104194318-86b55-d3c3bb31e84dbc8b2352e206b45bf24ea90ffbf8.gz

4 files changed, 29 insertions, 28 deletions

diff --git a/src/jmc/jabber/component.py b/src/jmc/jabber/component.py
index 9a66477..00a9c32 100644
--- a/src/jmc/jabber/component.py
+++ b/src/jmc/jabber/component.py
@@ -127,7 +127,7 @@ class MailComponent(FeederComponent):
                                  lang=lang,
                                  account_manager_class=account_manager_class,
                                  command_manager_class=command_manager_class)
-        self.handler = MailFeederHandler(MailFeeder(self), MailSender(self))
+        self.tick_handlers = [MailFeederHandler(MailFeeder(self), MailSender(self))]
         self.account_manager.account_classes = (IMAPAccount,
                                                 POP3Account,
                                                 SMTPAccount)
@@ -151,4 +151,5 @@ class MailComponent(FeederComponent):
     def check_email_accounts(self, accounts, lang_class=None):
         if lang_class is None:
             lang_class = self.lang.get_default_lang_class()
-        self.handler.handle(None, lang_class, accounts)
+        for handler in self.tick_handlers:
+            handler.handle(None, lang_class, accounts)
diff --git a/src/jmc/jabber/tests/command.py b/src/jmc/jabber/tests/command.py
index c336b1a..fb76c9f 100644
--- a/src/jmc/jabber/tests/command.py
+++ b/src/jmc/jabber/tests/command.py
@@ -106,7 +106,7 @@ class MailCommandManagerTestCase(JCLCommandManagerTestCase):
                             >= (_account.interval * self.component.time_unit)))
                 return []
 
-        self.comp.handler.feeder = MockFeederHandler(self.comp)
+        self.comp.tick_handlers[0].feeder = MockFeederHandler(self.comp)
 
     def tearDown(self):
         JCLTestCase.tearDown(self)
@@ -141,7 +141,7 @@ class MailCommandManagerForceCheckCommand_TestCase(MailCommandManagerTestCase):
                 + "status='completed'>"
                 + "</command></iq>",
                 result_iq, True, test_sibling=False))
-        feeder = self.comp.handler.feeder
+        feeder = self.comp.tick_handlers[0].feeder
         self.assertEquals(len(feeder.checked_accounts), 1)
         self.assertEquals(feeder.checked_accounts[0], self.account11)
 
@@ -207,7 +207,7 @@ class MailCommandManagerForceCheckCommand_TestCase(MailCommandManagerTestCase):
         self.assertEquals(context_session["account_names"],
                           ["account11/test1@test.com",
                            "account12/test1@test.com"])
-        feeder = self.comp.handler.feeder
+        feeder = self.comp.tick_handlers[0].feeder
         self.assertEquals(len(feeder.checked_accounts), 2)
         self.assertEquals(feeder.checked_accounts[0], self.account11)
         self.assertEquals(feeder.checked_accounts[1], self.account12)
diff --git a/src/jmc/jabber/tests/component.py b/src/jmc/jabber/tests/component.py
index b7b54b6..b09b9aa 100644
--- a/src/jmc/jabber/tests/component.py
+++ b/src/jmc/jabber/tests/component.py
@@ -228,7 +228,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.live_email_only = False
         account11.lastcheck = 0
         account11.password = ""
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(len(result), 0)
         sent = self.comp.stream.sent
         self.assertEquals(len(sent), 0)
@@ -251,7 +251,7 @@ class MailComponent_TestCase(JCLTestCase):
         self.assertFalse(account11.waiting_password_reply)
         account11.live_email_only = True
         account11.password = None
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(len(result), 0)
         sent = self.comp.stream.sent
         self.assertEquals(len(sent), 1)
@@ -274,7 +274,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.waiting_password_reply = True
         account11.live_email_only = True
         account11.password = None
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(result, [])
         self.assertTrue(account11.first_check)
         self.assertTrue(account11.waiting_password_reply)
@@ -292,7 +292,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.first_check = False
         account11.lastcheck = old_value = int(time.time()) - 2
         account11.interval = 2
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(result, [])
         self.assertFalse(self._account_has_been_checked(account11,
                                                         old_value))
@@ -305,7 +305,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.first_check = True
         account11.lastcheck = 0
         account11.interval = 2
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(result, [])
         self.assertTrue(self._account_has_been_checked(account11, 0))
 
@@ -317,7 +317,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.first_check = False
         account11.lastcheck = 0
         account11.interval = 2
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(result, [])
         self.assertTrue(self._account_has_been_checked(account11, 0))
 
@@ -332,7 +332,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.interval = 2
         account11.password = None
         self.assertFalse(account11.waiting_password_reply)
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(account11.error, None)
         self.assertEquals(len(result), 0)
         sent = self.comp.stream.sent
@@ -354,7 +354,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.interval = 2
         account11.password = "password"
         account11.get_new_mail_list = lambda: []
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertNotEquals(account11.error, None)
         self.assertEquals(len(result), 0)
         sent = self.comp.stream.sent
@@ -381,7 +381,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.interval = 2
         account11.password = "password"
         account11.get_new_mail_list = lambda: []
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(account11.error, None)
         self.assertEquals(result, [])
         self.assertTrue(self._account_has_been_checked(account11, 0))
@@ -401,7 +401,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.interval = 2
         account11.password = "password"
         account11.get_new_mail_list = lambda: []
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(account11.error, None)
         self.assertEquals(result, [])
         self.assertTrue(self._account_has_been_checked(account11, 0))
@@ -431,7 +431,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.password = "password"
         account11.get_new_mail_list = lambda: [0, 1]
         account11.get_mail = mock_get_mail
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(account11.error, None)
         self.assertTrue(self._account_has_been_checked(account11, 0))
         self.assertFalse(account11.connected)
@@ -464,7 +464,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.interval = 2
         account11.password = "password"
         account11.get_new_mail_list = lambda: []
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(account11.error, None)
         self.assertEquals(result, [])
         self.assertTrue(self._account_has_been_checked(account11, 0))
@@ -489,7 +489,7 @@ class MailComponent_TestCase(JCLTestCase):
         account11.password = "password"
         account11.get_new_mail_list = lambda: [0, 1]
         account11.get_mail_summary = mock_get_mail_summary
-        result = self.comp.handler.feeder.feed(account11)
+        result = self.comp.tick_handlers[0].feeder.feed(account11)
         self.assertEquals(account11.error, None)
         self.assertTrue(self._account_has_been_checked(account11, 0))
         self.assertFalse(account11.connected)
@@ -515,7 +515,7 @@ class MailComponent_TestCase(JCLTestCase):
         self.assertEquals(account11.error, None)
         account11.live_email_only = True
         account11.password = "password"
-        continue_checking = self.comp.handler.feeder.initialize_live_email(account11)
+        continue_checking = self.comp.tick_handlers[0].feeder.initialize_live_email(account11)
         self.assertEquals(continue_checking, True)
         self.assertFalse(account11.first_check)
         self.assertFalse(account11.waiting_password_reply)
@@ -536,7 +536,7 @@ class MailComponent_TestCase(JCLTestCase):
         self.assertEquals(account11.error, None)
         account11.live_email_only = True
         account11.password = "password"
-        continue_checking = self.comp.handler.feeder.initialize_live_email(account11)
+        continue_checking = self.comp.tick_handlers[0].feeder.initialize_live_email(account11)
         self.assertEquals(continue_checking, False)
         sent = self.comp.stream.sent
         self.assertEquals(len(sent), 2)
@@ -566,7 +566,7 @@ class MailComponent_TestCase(JCLTestCase):
         self.assertEquals(account11.error, None)
         account11.live_email_only = True
         account11.password = "password"
-        continue_checking = self.comp.handler.feeder.initialize_live_email(account11)
+        continue_checking = self.comp.tick_handlers[0].feeder.initialize_live_email(account11)
         self.assertEquals(continue_checking, False)
         sent = self.comp.stream.sent
         self.assertEquals(len(sent), 2)
@@ -596,7 +596,7 @@ class MailComponent_TestCase(JCLTestCase):
         self.assertEquals(account11.error, None)
         account11.live_email_only = True
         account11.password = "password"
-        continue_checking = self.comp.handler.feeder.initialize_live_email(account11)
+        continue_checking = self.comp.tick_handlers[0].feeder.initialize_live_email(account11)
         self.assertFalse(continue_checking)
         sent = self.comp.stream.sent
         self.assertEquals(len(sent), 2)
@@ -624,7 +624,7 @@ class MailComponent_TestCase(JCLTestCase):
         self.assertTrue(account11.first_check)
         account11.live_email_only = True
         account11.password = "password"
-        continue_checking = self.comp.handler.feeder.initialize_live_email(account11)
+        continue_checking = self.comp.tick_handlers[0].feeder.initialize_live_email(account11)
         self.assertEquals(continue_checking, True)
         self.assertFalse(account11.first_check)
         self.assertFalse(account11.waiting_password_reply)
diff --git a/src/jmc/model/tests/account.py b/src/jmc/model/tests/account.py
index a46236f..6790567 100644
--- a/src/jmc/model/tests/account.py
+++ b/src/jmc/model/tests/account.py
@@ -953,7 +953,7 @@ class SMTPAccount_TestCase(Account_TestCase):
                                     None, None, None, None,
                                     None, None, None, None,
                                     "250 OK\r\n"],
-                                   ["ehlo \[127.0...1\]\r\n",
+                                   ["ehlo .*\r\n",
                                     "mail FROM:<" + str(email['From']) + ">.*",
                                     "rcpt TO:<" + str(email['To']) + ">\r\n",
                                     "data\r\n"] +
@@ -986,8 +986,8 @@ class SMTPAccount_TestCase(Account_TestCase):
                                     None, None, None, None,
                                     None, None, None, None,
                                     "250 OK\r\n"],
-                                   ["ehlo \[127.0...1\]\r\n",
-                                    "helo \[127.0...1\]\r\n",
+                                   ["ehlo .*\r\n",
+                                    "helo .*\r\n",
                                     "mail FROM:<" + str(email['From']) + ">.*",
                                     "rcpt TO:<" + str(email['To']) + ">\r\n",
                                     "data\r\n"] +
@@ -1024,7 +1024,7 @@ class SMTPAccount_TestCase(Account_TestCase):
                                     None, None, None, None,
                                     None, None, None, None,
                                     "250 OK\r\n"],
-                                   ["ehlo \[127.0...1\]\r\n",
+                                   ["ehlo .*\r\n",
                                     "AUTH CRAM-MD5\r\n",
                                     ".*\r\n",
                                     "mail FROM:<" + str(email['From']) + ">.*",
@@ -1065,7 +1065,7 @@ class SMTPAccount_TestCase(Account_TestCase):
                                     None, None, None, None,
                                     None, None, None, None,
                                     "250 OK\r\n"],
-                                   ["ehlo \[127.0...1\]\r\n",
+                                   ["ehlo .*\r\n",
                                     "AUTH CRAM-MD5\r\n",
                                     ".*\r\n",
                                     "AUTH LOGIN .*\r\n",