[Erp5-report] r37934 luke - /erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py

[nobody at svn.erp5.org]

Author: luke
Date: Mon Aug 23 08:28:31 2010
New Revision: 37934

URL: http://svn.erp5.org?rev=37934&view=rev
Log:
 - removes hack by inverting logic - find portal object by checking objects
   meta type and then using such portal object to fetch its id

Modified:
    erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py?rev=37934&r1=37933&r2=37934&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeLiveTestCase.py [utf8] Mon Aug 23 08:28:31 2010
@@ -80,12 +80,15 @@ class ERP5TypeLiveTestCase(ProcessingNod
     def getPortalName(self):
       """ Return the default ERP5 site id.
       """
-      return 'erp5' # XXX-JPS For now a hack
+      return self.getPortalObject().getId()
 
     def getPortal(self):
       """Returns the portal object, i.e. the "fixture root".
       """
-      return self.app[self.getPortalName()]
+      # Assumes that portal exists (which has sense) and that there is only one
+      # ERP5 site in Zope (which is always the case)
+      return [q for q in self.app.objectValues() if q.meta_type == 'ERP5 Site'
+          ][0]
 
     getPortalObject = getPortal