Delete unused parameter

darcs-hash:20080528172113-86b55-cff8b5e172feec18c62bf2ad2914b535a54cba88.gz

4 files changed, 1 insertions, 16 deletions

diff --git a/src/jmc/runner.py b/src/jmc/runner.py
index e900547..48d4bbf 100644
--- a/src/jmc/runner.py
+++ b/src/jmc/runner.py
@@ -36,7 +36,6 @@ class JMCRunner(JCLRunner):
         JCLRunner.__init__(self, component_name, component_version)
         self.component_short_name = "JMC"
         # define new options
-        self.check_interval = 1
         self.mail_default_encoding = "iso-8859-1"
         self.smtp_default_login = None
         self.smtp_default_password = None
@@ -45,11 +44,7 @@ class JMCRunner(JCLRunner):
         self.smtp_default_tls = False
         self.smtp_default_label = None
         self.enable_smtp_default_account = False
-        self.options += [("i:", "check-interval=", "jmc",
-                          " INTERVAL\t\t\tInterval unit in minutes between mail checks",
-                          lambda arg: self.set_attr("check_interval",
-                                                    int(arg))),
-                         ("e:", "mail-default-encoding=", "jmc",
+        self.options += [("e:", "mail-default-encoding=", "jmc",
                           " ENCODING\t\tDefault encoding of the component",
                           lambda arg: self.set_attr("mail_default_encoding",
                                                     arg)),
@@ -124,7 +119,6 @@ class JMCRunner(JCLRunner):
             if self.enable_smtp_default_account:
                 component.account_manager.account_classes += (GlobalSMTPAccount,)
             MailAccount.default_encoding = self.mail_default_encoding
-            component.check_interval = self.check_interval
             component.disco_identity.set_category("gateway")
             component.disco_identity.set_type("smtp")
             return component.run()
diff --git a/src/jmc/tests/jmc.conf b/src/jmc/tests/jmc.conf
index 91ca664..ab46615 100644
--- a/src/jmc/tests/jmc.conf
+++ b/src/jmc/tests/jmc.conf
@@ -21,7 +21,6 @@ log_file: /tmp/jmc.log
 
 [jmc]
 mail_default_encoding: test_iso-8859-1
-check_interval: 2
 
 [smtp]
 smtp_default_login: testlogin
diff --git a/src/jmc/tests/runner.py b/src/jmc/tests/runner.py
index 62fdf2b..400c077 100644
--- a/src/jmc/tests/runner.py
+++ b/src/jmc/tests/runner.py
@@ -80,7 +80,6 @@ class JMCRunner_TestCase(JCLTestCase):
         self.assertEquals(self.runner.pid_file, "/var/run/jabber/jmc.pid")
         self.assertFalse(self.runner.debug)
         self.assertEquals(self.runner.mail_default_encoding, "iso-8859-1")
-        self.assertEquals(self.runner.check_interval, 1)
         self.assertEquals(self.runner.smtp_default_login, None)
         self.assertEquals(self.runner.smtp_default_password, None)
         self.assertEquals(self.runner.smtp_default_host, None)
@@ -111,7 +110,6 @@ class JMCRunner_TestCase(JCLTestCase):
         self.assertEquals(self.runner.db_url, "test_sqlite://root@localhost/var/spool/jabber/test_jmc.db")
         self.assertEquals(self.runner.pid_file, "/var/run/jabber/test_jmc.pid")
         self.assertFalse(self.runner.debug)
-        self.assertEquals(self.runner.check_interval, 2)
         self.assertEquals(self.runner.mail_default_encoding, "test_iso-8859-1")
         self.assertEquals(self.runner.smtp_default_login, "testlogin")
         self.assertEquals(self.runner.smtp_default_password, "testpassword")
@@ -143,7 +141,6 @@ class JMCRunner_TestCase(JCLTestCase):
         self.assertEquals(self.runner.db_url, "test_sqlite://root@localhost/var/spool/jabber/test_jmc.db")
         self.assertEquals(self.runner.pid_file, "/var/run/jabber/test_jmc.pid")
         self.assertFalse(self.runner.debug)
-        self.assertEquals(self.runner.check_interval, 2)
         self.assertEquals(self.runner.mail_default_encoding, "test_iso-8859-1")
         self.assertEquals(self.runner.smtp_default_login, None)
         self.assertEquals(self.runner.smtp_default_password, None)
@@ -174,7 +171,6 @@ class JMCRunner_TestCase(JCLTestCase):
                     "-u", "sqlite:///tmp/test_jmc.db",
                     "-p", "/tmp/test_jmc.pid",
                     "-e", "test2_iso-8859-1",
-                    "-i", "3",
                     "-g", "testlogin",
                     "-a", "testpassword",
                     "-t", "testhost",
@@ -192,7 +188,6 @@ class JMCRunner_TestCase(JCLTestCase):
         self.assertEquals(self.runner.pid_file, "/tmp/test_jmc.pid")
         self.assertFalse(self.runner.debug)
         self.assertEquals(self.runner.mail_default_encoding, "test2_iso-8859-1")
-        self.assertEquals(self.runner.check_interval, 3)
         self.assertEquals(self.runner.smtp_default_login, "testlogin")
         self.assertEquals(self.runner.smtp_default_password, "testpassword")
         self.assertEquals(self.runner.smtp_default_host, "testhost")
@@ -222,7 +217,6 @@ class JMCRunner_TestCase(JCLTestCase):
                     "--db-url", "sqlite:///tmp/test_jmc.db",
                     "--pid-file", "/tmp/test_jmc.pid",
                     "--mail-default-encoding", "test2_iso-8859-1",
-                    "--check-interval", "4",
                     "--smtp-default-login", "testlogin",
                     "--smtp-default-password", "testpassword",
                     "--smtp-default-host", "testhost",
@@ -240,7 +234,6 @@ class JMCRunner_TestCase(JCLTestCase):
         self.assertEquals(self.runner.pid_file, "/tmp/test_jmc.pid")
         self.assertFalse(self.runner.debug)
         self.assertEquals(self.runner.mail_default_encoding, "test2_iso-8859-1")
-        self.assertEquals(self.runner.check_interval, 4)
         self.assertEquals(self.runner.smtp_default_login, "testlogin")
         self.assertEquals(self.runner.smtp_default_password, "testpassword")
         self.assertEquals(self.runner.smtp_default_host, "testhost")
diff --git a/src/jmc/tests/uncomplete_jmc.conf b/src/jmc/tests/uncomplete_jmc.conf
index 02ab0e9..6060518 100644
--- a/src/jmc/tests/uncomplete_jmc.conf
+++ b/src/jmc/tests/uncomplete_jmc.conf
@@ -21,4 +21,3 @@ log_file: /tmp/jmc.log
 
 [jmc]
 mail_default_encoding: test_iso-8859-1
-check_interval: 2