Changeset 15:8ae771653ffe in mailjam for postman/tests/mta.py

Timestamp:

May 21, 2012, 7:22:27 PM (12 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Added a postman-mta.conf version to be used in the tests

Added a script bin/postman-mta that will run the MTA client from a shell

Renamed the bin/postman_server script to bin/postman-server

Disabled the tests from tests/mta.py, as they are totally outdated and they
break the tests.

Replaced the old code in mta.Sendmail with a new mta.MTAClient class, which
contains code that actually *works* against a postman server (tests to come!)

Restructured the postman-mta.conf configuration file. The sections have better
names now (server, archive) and the archive section contains parameters which
names that reflect much better what they are used for.

Added a new parameter to the postman-mta.conf file (server.uri) that allows
us to set the uri to where any MTA client will have to connect, in only one
shorter line.

Fixed some typos in postman.config

Updated the setup.py script so the bin/postman-* scripts are installed
properly in the bin/ directory.

Added a function, proper_etc_path(), to the setup.py script so the path where
configuration files have to be installed is correctly set when building a
distribution/source package (still to be tested).

Updated the MANIFEST

File:

• postman/tests/mta.py (modified) (3 diffs)

postman/tests/mta.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 
-import os, sys
+import os, sys, multiprocessing, time
 from unittest import TestCase
-from postman.mta import Sendmail
+from postman.mta import MTAClient
+from postman.daemon import PostmanDaemon
 from postman.models import Member, MailingList
 
-class TestSendmail(TestCase):
+
+class TestMTAClient(TestCase):
+    """
+    FIXME: These are dummy tests, they cover almost nothing from the
+    real postman mta client (yet)
+    """
     def setUp(self):
+        self.mta_configfile = os.path.join(os.path.dirname(__file__),
+                                           'postman-mta.conf')
         self.configfile = os.path.join(os.path.dirname(__file__),
                                        'postman.conf')
@@ -13 +21 @@
                                         members={}, configfile=self.configfile)
         self.member =  Member('test@example.com')
-        self.mta = Sendmail(self.mailing_list)
         self.raw_email_file = os.path.join(os.path.dirname(__file__),
                                            'sample_raw_email.txt')
@@ -19 +26 @@
         self.raw_email = tmp_to_read.read()
         tmp_to_read.close()
-        
+
     def test___init__(self):
+        # in order to start mta client instances, we need to have a postman
+        # daemon running on the background
+        # This should be added to the setUp() method, but then it would be
+        # more difficult to terminate the process after all the methods
+        # were called
+        daemon = PostmanDaemon(self.configfile)
+        daemon.port = 9100
+        p = multiprocessing.Process(target=daemon.run)
+        p.start()
+        # Add a delay here to allow the server to be fully started before
+        # starting to send requests from the client
+        time.sleep(1)
+
         with self.assertRaises(ValueError):
-            mta = Sendmail('test_list@example.com')
-            mta = Sendmail(self.member)
-            mta = Sendmail(None)
-        mta = Sendmail(self.mailing_list)
-        self.assertTrue(isinstance(mta, Sendmail))
-        self.assertEqual(mta.mailing_list, self.mailing_list)
+            mta = MTAClient(self.mailing_list, self.mta_configfile)
+            mta = MTAClient(self.member, self.mta_configfile)
+            mta = MTAClient(None, self.mta_configfile)
+        mta = MTAClient(self.mailing_list.address, self.mta_configfile)
+        self.assertTrue(isinstance(mta, MTAClient))
+        self.assertEqual(mta.address, self.mailing_list.address)
         self.assertEqual(mta.suscriptors, self.mailing_list.members_addresses)
         self.assertEqual(mta.reply_to, self.mailing_list.address)
 
+        p.terminate()
+
     def test_get_raw_email(self):
+        # in order to start mta client instances, we need to have a postman
+        # daemon running on the background
+        # This should be added to the setUp() method, but then it would be
+        # more difficult to terminate the process after all the methods
+        # were called
+        daemon = PostmanDaemon(self.configfile)
+        daemon.port = 9100
+        p = multiprocessing.Process(target=daemon.run)
+        p.start()
+        # Add a delay here to allow the server to be fully started before
+        # starting to send requests from the client
+        time.sleep(1)
+
+        mta = MTAClient(self.mailing_list.address, self.mta_configfile)
+
         sys_stdin = sys.stdin
         sys.stdin = open(self.raw_email_file, 'r')
-        self.assertEqual(self.mta.get_raw_email(),
+        self.assertEqual(mta.get_raw_email(),
                          self.raw_email)
         sys.stdin.close()
         with self.assertRaises(IOError):
-            self.mta.get_raw_email()
+            mta.get_raw_email()
+
+        tmp_file= open(self.raw_email_file('r'))
+        raw_data = tmp_file.read()
+        tmp_file.close()
+        self.assertEqual(mta.get_raw_email(raw_data),
+                         self.raw_email)
+
+        p.terminate()
 
     #def save_raw_email(self):