[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kupu-checkins
Subject:    [kupu-checkins] r14818 - in kupu/trunk/kupu/plone: . tests
From:       duncan () codespeak ! net
Date:       2005-07-20 14:37:18
Message-ID: 20050720143718.506AB27B7C () code1 ! codespeak ! net
[Download RAW message or body]

Author: duncan
Date: Wed Jul 20 16:37:17 2005
New Revision: 14818

Modified:
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/tests/runme.cmd
   kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py
Log:
Refactored plone tests for a 50 times speedup on Plone 2.1.

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Wed Jul 20 16:37:17 2005
@@ -221,7 +221,7 @@
 
     security.declarePublic('docs')
     def docs(self):
-        """Returns FormController docs formatted as HTML"""
+        """Returns Kupu docs formatted as HTML"""
         docpath = os.path.join(Globals.package_home(kupu_globals), 'doc')
         f = open(os.path.join(docpath, 'PLONE2.txt'), 'r')
         _docs = f.read()
@@ -229,7 +229,7 @@
 
     security.declareProtected(permissions.ManageLibraries, "zmi_docs")
     zmi_docs = PageTemplateFile("zmi_docs.pt", globals())
-    zmi_docs.title = 'kupu configuration'
+    zmi_docs.title = 'kupu configuration documentation'
 
     security.declareProtected(permissions.ManageLibraries, "sanity_check")
     sanity_check = PageTemplateFile("sanity_check.pt", globals())

Modified: kupu/trunk/kupu/plone/tests/runme.cmd
==============================================================================
--- kupu/trunk/kupu/plone/tests/runme.cmd	(original)
+++ kupu/trunk/kupu/plone/tests/runme.cmd	Wed Jul 20 16:37:17 2005
@@ -7,9 +7,9 @@
 set PRODUCTS_PATH=%PLONEHOME%\Zope\lib\python\Products;%PLONEHOME%\Data\Products;%~D0%~P0..\..\..
 set INSTANCE_HOME=%PLONEHOME%\Data
 set SOFTWARE_HOME=%PLONEHOME%\Zope\lib\python
-rem "%PLONEHOME%\Python\python.exe" %~D0%~P0test_browserSupportsKupu.py
+rem "%PLONEHOME%\Python\python.exe" %~D0%~P0test_browserSupportsKupu.py %2
 rem "%PLONEHOME%\Python\python.exe" %~D0%~P0test_librarymanager.py
 rem "%PLONEHOME%\Python\python.exe" %~D0%~P0test_html2captioned.py
 rem "%PLONEHOME%\Python\python.exe" %~D0%~P0test_resourcetypemapper.py
-"%PLONEHOME%\Python\python.exe" %~D0%~P0runalltests.py
+"%PLONEHOME%\Python\python.exe" %~D0%~P0runalltests.py %2
 endlocal

Modified: kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py	(original)
+++ kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py	Wed Jul 20 16:37:17 2005
@@ -13,20 +13,47 @@
 """
 
 import os, sys
+import time
 if __name__ == '__main__':
     execfile(os.path.join(sys.path[0], 'framework.py'))
 
-from Testing.ZopeTestCase import installProduct
+from Testing import ZopeTestCase
 from Products.CMFPlone.tests import PloneTestCase
-installProduct('kupu')
+from Products.CMFPlone.tests.PloneTestCase import portal_name, portal_owner
+from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
+
+def installKupu(quiet=0):
+    _start = time.time()
+    if not quiet: ZopeTestCase._print('Adding Kupu ... ')
+
+    ZopeTestCase.installProduct('kupu')
+
+    # Install kupu into the test site. Done here because otherwise
+    # it slows the tests down a lot on Plone 2.1
+    app = ZopeTestCase.app()
+    user = app.acl_users.getUserById(portal_owner).__of__(app.acl_users)
+    newSecurityManager(None, user)
+
+    portal = app[portal_name]
+    quickinstaller = portal.portal_quickinstaller
+    quickinstaller.installProduct('kupu')
+
+    # Log out
+    noSecurityManager()
+    get_transaction().commit()
+    if not quiet: ZopeTestCase._print('done (%.3fs)\n' \
+                                      % (time.time()-_start,))
+    ZopeTestCase.close(app)
+
+installKupu()
 
 class TestBrowserSupportsKupu(PloneTestCase.PloneTestCase):
 
     def afterSetUp(self):
         md = self.portal.portal_memberdata
         md._updateProperty('wysiwyg_editor', 'Kupu')
-        self.qi = self.portal.portal_quickinstaller
-        self.qi.installProduct('kupu')
+        #self.qi = self.portal.portal_quickinstaller
+        #self.qi.installProduct('kupu')
         #self.script = self.portal.portal_skins.kupu_plone.browserSupportsKupu
         self.script = self.portal.kupu_library_tool.isKupuEnabled
 

[prev in list] [next in list] [prev in thread] [next in thread]