[Erp5-report] r27838 - in /erp5/trunk/products/ERP5OOo/tests: testDms.py testIngestion.py

[nobody at svn.erp5.org]

Author: jm
Date: Tue Jun 30 18:06:35 2009
New Revision: 27838

URL: http://svn.erp5.org?rev=27838&view=rev
Log:
Same as [27822] for ERP5OOo.

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

Modified: erp5/trunk/products/ERP5OOo/tests/testDms.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testDms.py?rev=27838&r1=27837&r2=27838&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] Tue Jun 30 18:06:35 2009
@@ -118,7 +118,8 @@
     default_pref.setPreferredOoodocServerPortNumber(conversion_server_host[1])
     default_pref.setPreferredDocumentFileNameRegularExpression(FILE_NAME_REGULAR_EXPRESSION)
     default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION)
-    default_pref.enable()
+    if default_pref.getPreferenceState() != 'global':
+      default_pref.enable()
 
   def getDocumentModule(self):
     return getattr(self.getPortal(),'document_module')
@@ -784,7 +785,8 @@
     default_pref.setPreferredOoodocServerPortNumber(conversion_server_host[1])
     default_pref.setPreferredDocumentFileNameRegularExpression(FILE_NAME_REGULAR_EXPRESSION)
     default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION)
-    default_pref.enable()
+    if default_pref.getPreferenceState() != 'global':
+      default_pref.enable()
     transaction.commit()
     self.tic()
 

Modified: erp5/trunk/products/ERP5OOo/tests/testIngestion.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testIngestion.py?rev=27838&r1=27837&r2=27838&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testIngestion.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testIngestion.py [utf8] Tue Jun 30 18:06:35 2009
@@ -122,7 +122,8 @@
     default_pref.setPreferredOoodocServerPortNumber(conversion_server_host[1])
     default_pref.setPreferredDocumentFileNameRegularExpression(FILE_NAME_REGULAR_EXPRESSION)
     default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION)
-    default_pref.enable()
+    if default_pref.getPreferenceState() != 'global':
+      default_pref.enable()
 
   def setSimulatedNotificationScript(self, sequence=None, sequence_list=None, **kw):
     """