[Checkins] SVN: zope.app.applicationcontrol/trunk/ - Added missing (normal and test) dependencies.

Jim Fulton jim at zope.com
Sat Aug 15 11:36:39 EDT 2009


Log message for revision 102812:
  - Added missing (normal and test) dependencies.
  
  - Renenabled functional tests.
  

Changed:
  U   zope.app.applicationcontrol/trunk/CHANGES.txt
  U   zope.app.applicationcontrol/trunk/setup.py
  D   zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/ftests/
  A   zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_errorredirect.py
  A   zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_translationdomaincontrol_functional.py
  A   zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_zodbcontrol.py
  A   zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/zodb.txt

-=-
Modified: zope.app.applicationcontrol/trunk/CHANGES.txt
===================================================================
--- zope.app.applicationcontrol/trunk/CHANGES.txt	2009-08-15 15:20:10 UTC (rev 102811)
+++ zope.app.applicationcontrol/trunk/CHANGES.txt	2009-08-15 15:36:39 UTC (rev 102812)
@@ -2,11 +2,13 @@
 CHANGES
 =======
 
-Version 3.5.1 (unreleased)
+Version 3.5.1 (2009-08-15)
 --------------------------
 
-- ... -\|/- ...
+- Added missing (normal and test) dependencies.
 
+- Renenabled functional tests.
+
 Version 3.5.0 (2009-05-23)
 --------------------------
 

Modified: zope.app.applicationcontrol/trunk/setup.py
===================================================================
--- zope.app.applicationcontrol/trunk/setup.py	2009-08-15 15:20:10 UTC (rev 102811)
+++ zope.app.applicationcontrol/trunk/setup.py	2009-08-15 15:36:39 UTC (rev 102812)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -11,11 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Setup for zope.app.applicationcontrol package
+version = '0'
 
-$Id$
-"""
-
 import os
 
 from setuptools import setup, find_packages
@@ -24,7 +21,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.app.applicationcontrol',
-    version = '3.5.1dev',
+    version = version,
     author='Zope Corporation and Contributors',
     author_email='zope3-dev at zope.org',
     description='Zope applicationcontrol',
@@ -49,17 +46,25 @@
         'Framework :: Zope3'],
     url='http://cheeseshop.python.org/pypi/zope.app.applicationcontrol',
     extras_require=dict(
-        test=['zope.app.testing']),
+        test=['zope.app.authentication',
+              'zope.app.component',
+              'zope.app.securitypolicy',
+              'zope.app.testing',
+              'zope.app.zcmlfiles',
+              'zope.app.zptpage',
+              'zope.testbrowser',
+              ]),
     package_dir = {'': 'src'},
     packages=find_packages('src'),
     namespace_packages=['zope', 'zope.app'],
     install_requires=[
-        'setuptools',
-        'zope.error',
-        'zope.interface',
-        'zope.i18n',
-        'zope.size',
-        'zope.traversing>=3.7.0',
+          'setuptools',
+          'zope.app.appsetuo'
+          'zope.error',
+          'zope.i18n',
+          'zope.interface',
+          'zope.size',
+          'zope.traversing>=3.7.0',
         ],
     include_package_data = True,
     zip_safe = False,

Copied: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_errorredirect.py (from rev 102811, zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/ftests/test_errorredirect.py)
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_errorredirect.py	                        (rev 0)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_errorredirect.py	2009-08-15 15:36:39 UTC (rev 102812)
@@ -0,0 +1,40 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""ZODB Control Tests
+
+$Id$
+"""
+import unittest
+
+from zope.app.testing.functional import BrowserTestCase
+from zope.app.applicationcontrol.testing import ApplicationControlLayer
+
+class ErrorRedirectTest(BrowserTestCase):
+
+    def testErrorRedirect(self):
+        response = self.publish('/++etc++process/@@errorRedirect.html',
+                                basic='globalmgr:globalmgrpw')
+        self.failUnlessEqual('http://localhost/@@errorRedirect.html',
+                             response.getHeader('Location'))
+        self.failUnlessEqual(302, response.getStatus())
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    ErrorRedirectTest.layer = ApplicationControlLayer
+    suite.addTest(unittest.makeSuite(ErrorRedirectTest))
+    return suite
+
+if __name__=='__main__':
+    unittest.main(defaultTest='test_suite')

Copied: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_translationdomaincontrol_functional.py (from rev 102811, zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/ftests/test_translationdomaincontrol.py)
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_translationdomaincontrol_functional.py	                        (rev 0)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_translationdomaincontrol_functional.py	2009-08-15 15:36:39 UTC (rev 102812)
@@ -0,0 +1,52 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Translation Domain Control Tests
+
+$Id$
+"""
+import unittest
+from zope.app.testing.functional import BrowserTestCase
+from zope.app.applicationcontrol.testing import ApplicationControlLayer
+
+class MessageCatalogControlTest(BrowserTestCase):
+
+    def testDomainOverview(self):
+        response = self.publish(
+            '/++etc++process/@@TranslationDomain.html',
+            basic='globalmgr:globalmgrpw')
+
+        body = response.getBody()
+        self.checkForBrokenLinks(body,
+                                 '/++etc++process/@@TranslationDomain.html',
+                                 basic='globalmgr:globalmgrpw')
+        
+    def testReload(self):
+        response = self.publish('/++etc++process/@@TranslationDomain.html',
+                                basic='globalmgr:globalmgrpw',
+                                form={'language': u'de',
+                                      'domain': u'zope',
+                                      'RELOAD': u'Reload'})
+        body = response.getBody()
+        self.assert_('Message Catalog for de language in zope domain'
+                     ' successfully reloaded.' in body)
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    MessageCatalogControlTest.layer = ApplicationControlLayer
+    suite.addTest(unittest.makeSuite(MessageCatalogControlTest))
+    return suite
+
+if __name__=='__main__':
+    unittest.main(defaultTest='test_suite')

Copied: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_zodbcontrol.py (from rev 102811, zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/ftests/test_zodbcontrol.py)
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_zodbcontrol.py	                        (rev 0)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_zodbcontrol.py	2009-08-15 15:36:39 UTC (rev 102812)
@@ -0,0 +1,50 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""ZODB Control Tests
+
+$Id$
+"""
+import unittest
+import ZODB.tests.util
+from ZODB.interfaces import IDatabase
+from zope.app.testing import functional
+from zope import component
+
+from zope.app.applicationcontrol.testing import ApplicationControlLayer
+
+def setUp(test):
+    test.databases = test.globs['getRootFolder']()._p_jar.db().databases
+    db2 = ZODB.tests.util.DB(databases=test.databases, database_name='2')
+
+    for name, db in test.databases.items():
+        component.provideUtility(db, IDatabase, name=name)
+
+
+def tearDown(test):
+    for db in test.databases.values():
+        db.close()
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    zodb = functional.FunctionalDocFileSuite('zodb.txt',
+                                             setUp=setUp,
+                                             tearDown=tearDown)
+    zodb.layer = ApplicationControlLayer
+    suite.addTest(zodb)
+    return suite
+
+
+if __name__=='__main__':
+    unittest.main(defaultTest='test_suite')

Copied: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/zodb.txt (from rev 102811, zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/ftests/zodb.txt)
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/zodb.txt	                        (rev 0)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/zodb.txt	2009-08-15 15:36:39 UTC (rev 102812)
@@ -0,0 +1,28 @@
+=================
+ZODB Control View
+=================
+
+We provide default views which are relevant for administering mount points.
+
+  >>> from zope.testbrowser.testing import Browser
+  >>> browser = Browser()
+  >>> browser.addHeader('Authorization','Basic mgr:mgrpw')
+  >>> browser.handleErrors = False
+
+  >>> browser.open('http://localhost/++etc++process/@@ZODBControl.html')
+  
+All registered databases are displayed. Each database can be packed by 
+selecting the according checkbox. Let us select the second database now:
+
+  >>> browser.getControl(name='dbs:list').value=['2']
+
+Now we define to pack the database back to 7 days:
+
+  >>> browser.getControl(name='days').value='7'
+  
+Finally let's submit the form and start packing the database:
+
+  >>> browser.getControl(name='PACK').click()
+  
+  >>> 'ZODB "2" successfully packed.' in browser.contents
+  True
\ No newline at end of file



More information about the Checkins mailing list