[Checkins] SVN: z3ext.preferences/trunk/ - Fixed test setup to run with ZTK.

Michael Howitz mh at gocept.com
Mon Nov 29 02:23:42 EST 2010


Log message for revision 118620:
  - Fixed test setup to run with ZTK.
  - Some tests in ``testbrowser.txt`` still fail.
  
  

Changed:
  U   z3ext.preferences/trunk/CHANGES.txt
  U   z3ext.preferences/trunk/setup.py
  U   z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml
  U   z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt

-=-
Modified: z3ext.preferences/trunk/CHANGES.txt
===================================================================
--- z3ext.preferences/trunk/CHANGES.txt	2010-11-28 15:55:08 UTC (rev 118619)
+++ z3ext.preferences/trunk/CHANGES.txt	2010-11-29 07:23:41 UTC (rev 118620)
@@ -1,3 +1,9 @@
+======
+ISSUES
+======
+
+- Some tests in ``testbrowser.txt`` fail.
+
 =======
 CHANGES
 =======
@@ -7,9 +13,11 @@
 
 - ZTK support
 
-- Added bootstrap code
+- Added bootstrap code.
 
+- Fixed test setup to run with ZTK.
 
+
 1.5.0 (2009-10-20)
 ------------------
 

Modified: z3ext.preferences/trunk/setup.py
===================================================================
--- z3ext.preferences/trunk/setup.py	2010-11-28 15:55:08 UTC (rev 118619)
+++ z3ext.preferences/trunk/setup.py	2010-11-29 07:23:41 UTC (rev 118620)
@@ -80,16 +80,18 @@
                           'z3ext.statusmessage',
                           'z3ext.resourcepackage',
                           ],
-      extras_require = dict(test=['zope.app.testing',
-                                  'zope.login',
-                                  'zope.testing',
-                                  'zope.testbrowser',
-                                  'zope.principalregistry',
-                                  'z3c.breadcrumb',
-                                  'z3ext.autoinclude',
-                                  'z3ext.authentication',
-                                  'z3ext.ui.breadcrumbs',
-                                  ]),
+      extras_require = dict(test=[
+          'z3c.breadcrumb',
+          'z3ext.authentication',
+          'z3ext.autoinclude',
+          'z3ext.ui.breadcrumbs',
+          'zope.app.generations',
+          'zope.app.testing',
+          'zope.login',
+          'zope.principalregistry',
+          'zope.testbrowser',
+          'zope.testing',
+          ]),
       include_package_data = True,
       zip_safe = False
       )

Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml	2010-11-28 15:55:08 UTC (rev 118619)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml	2010-11-29 07:23:41 UTC (rev 118620)
@@ -5,15 +5,30 @@
    i18n_domain="zope">
 
   <exclude package="zope.dublincore.browser" />
+  <exclude package="zope.app.authentication" file="session.zcml" />
+  <exclude package="zope.app.authentication" file="httpplugins.zcml" />
+  <exclude package="zope.app.authentication" file="principalfolder.zcml" />
+  <exclude package="zope.app.authentication" file="groupfolder.zcml" />
+  <exclude package="zope.app.authentication.browser" />
+  <exclude package="zope.app.cache.browser" />
+  <exclude package="zope.app.intid.browser" />
+  <exclude package="z3ext.controlpanel.browser" />
+  <exclude package="lovely.memcached.browser" />
+  <exclude package="zope.app.generations.browser" />
+  <exclude package="z3c.form.browser" file="radio.zcml" />
 
+
+
   <include package="z3ext.autoinclude" file="meta.zcml" />
   <includeAllDependencies package="z3ext.preferences" extras="test" />
 
   <include package="z3ext.preferences.tests" />
   <includeOverrides package="z3ext.preferences.tests" file="overrides.zcml" />
 
- <browser:defaultSkin name="DefaultSkin" />
+  <include package="zope.traversing.browser" />
 
+  <browser:defaultSkin name="DefaultSkin" />
+
   <securityPolicy
      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 

Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt	2010-11-28 15:55:08 UTC (rev 118619)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt	2010-11-29 07:23:41 UTC (rev 118620)
@@ -79,7 +79,7 @@
               <div class="z-listing-details">
                 <a href="category/prefs1/">
                   Preferences 1</a>
-                <div> 
+                <div>
                   &nbsp;</div>
               </div>
             </li>
@@ -87,7 +87,7 @@
               <div class="z-listing-details">
                 <a href="category/prefs2/">
                   Preferences 2</a>
-                <div> 
+                <div>
                   &nbsp;</div>
             </div>
           </li>



More information about the checkins mailing list