[Erp5-report] r33490 ivan - /erp5/trunk/products/ERP5OOo/tests/testIngestion.py

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Mar  8 09:42:39 2010
New Revision: 33490

URL: http://svn.erp5.org?rev=33490&view=rev
Log:
Reduce copy / paste code.

Modified:
    erp5/trunk/products/ERP5OOo/tests/testIngestion.py

Modified: erp5/trunk/products/ERP5OOo/tests/testIngestion.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testIngestion.py?rev=33490&r1=33489&r2=33490&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testIngestion.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testIngestion.py [utf8] Mon Mar  8 09:42:39 2010
@@ -888,18 +888,10 @@
     self.setDiscoveryOrder(['user_login', 'file_name', 'content', 'input'])
     self.discoverMetadata()
     self.checkMetadataOrder(expected_metadata)
-
-  def stepReceiveEmailFromUnknown(self, sequence=None, sequence_list=None, **kw):
-    """
-      email was sent in by someone who is not in the person_module
-    """
-    f = open(makeFilePath('email_from.txt'))
-    document = self.receiveEmail(data=f.read())
-    self.stepTic()
-
-  def stepReceiveEmailFromJohn(self, sequence=None, sequence_list=None, **kw):
-    """
-      email was sent in by someone who is in the person_module
+   
+  def stepReceiveEmail(self, sequence=None, sequence_list=None, **kw):
+    """
+      Email was sent in by someone to ERP5.
     """
     f = open(makeFilePath('email_from.txt'))
     document = self.receiveEmail(f.read())
@@ -1283,9 +1275,12 @@
     if not run: return
     if not quiet: printAndLog('test_11_EmailIngestion')
     step_list = [ 'stepCleanUp'
-                 ,'stepReceiveEmailFromUnknown'
+                 # unknown sender
+                 ,'stepReceiveEmail'
+                 # create sender as Person object in ERP5
                  ,'stepCreatePerson'
-                 ,'stepReceiveEmailFromJohn'
+                 # now a known sender
+                 ,'stepReceiveEmail'
                  ,'stepVerifyEmailedDocuments'
                 ]
     self.playSequence(step_list, quiet)
@@ -1378,7 +1373,6 @@
     # Clear catalog
     portal_catalog = self.getCatalogTool()
     portal_catalog.manage_catalogClear()
-    
     # Reindex all
     portal.ERP5Site_reindexAll()
     self.stepTic()