[Checkins] SVN: z3c.recipe.paster/trunk/ - fixed test setup , probably we lost some eggs during dependency refactoring (zope.app.zcmlfiles?)

[Roger Ineichen]

Log message for revision 100732:
  - fixed test setup , probably we lost some eggs during dependency refactoring (zope.app.zcmlfiles?)
    add all of them explicit in test
  - fixed test normalizer

Changed:
  U   z3c.recipe.paster/trunk/CHANGES.txt
  U   z3c.recipe.paster/trunk/buildout.cfg
  U   z3c.recipe.paster/trunk/setup.py
  U   z3c.recipe.paster/trunk/src/z3c/recipe/paster/paster.py
  U   z3c.recipe.paster/trunk/src/z3c/recipe/paster/serve.py
  U   z3c.recipe.paster/trunk/src/z3c/recipe/paster/tests.py

-=-
Modified: z3c.recipe.paster/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.paster/trunk/CHANGES.txt	2009-06-08 07:31:12 UTC (rev 100731)
+++ z3c.recipe.paster/trunk/CHANGES.txt	2009-06-08 07:37:20 UTC (rev 100732)
@@ -5,6 +5,10 @@
 0.5.1dev (unreleased)
 ---------------------
 
+- Fixed tests and fix all eggs in test setup
+
+- Fixed test normalizer
+
 - Updated tests, so they work with current packages.
 
 - Fixed tests, so they should run both an Windows-like and Unix-like

Modified: z3c.recipe.paster/trunk/buildout.cfg
===================================================================
--- z3c.recipe.paster/trunk/buildout.cfg	2009-06-08 07:31:12 UTC (rev 100731)
+++ z3c.recipe.paster/trunk/buildout.cfg	2009-06-08 07:37:20 UTC (rev 100732)
@@ -1,7 +1,11 @@
 [buildout]
-parts = test
+parts = test checker
 develop = .
 
 [test]
 recipe = zc.recipe.testrunner
 eggs = z3c.recipe.paster [test]
+
+[checker]
+recipe = lovely.recipe:importchecker
+path = src/z3c/recipe/paster

Modified: z3c.recipe.paster/trunk/setup.py
===================================================================
--- z3c.recipe.paster/trunk/setup.py	2009-06-08 07:31:12 UTC (rev 100731)
+++ z3c.recipe.paster/trunk/setup.py	2009-06-08 07:37:20 UTC (rev 100732)
@@ -60,11 +60,70 @@
     namespace_packages = ['z3c', 'z3c.recipe'],
     extras_require = dict(
         test = [
-            'zope.testing',
-            'zc.recipe.egg',
-            'ZConfig >=2.4a5',
+            'RestrictedPython',
+            'transaction',
+            'ZODB3',
+            'pytz',
+            'zc.lockfile',
             'zc.recipe.filestorage',
+            'zdaemon',
+            'zodbcode',
+            'zope.annotation',
+            'zope.app.applicationcontrol',
             'zope.app.appsetup',
+            'zope.authentication',
+            'zope.principalregistry',
+            'zope.app.localpermission',
+            'zope.password',
+            'zope.app.basicskin',
+            'zope.app.component',
+            'zope.app.container',
+            'zope.app.dependable',
+            'zope.app.exception',
+            'zope.app.form',
+            'zope.app.http',
+            'zope.app.interface',
+            'zope.app.pagetemplate',
+            'zope.app.publication',
+            'zope.app.publisher',
+            'zope.app.security',
+            'zope.browser',
+            'zope.broken',
+            'zope.cachedescriptors',
+            'zope.component',
+            'zope.configuration',
+            'zope.container',
+            'zope.contenttype',
+            'zope.copy',
+            'zope.copypastemove',
+            'zope.datetime',
+            'zope.deferredimport',
+            'zope.deprecation',
+            'zope.dottedname',
+            'zope.dublincore',
+            'zope.error',
+            'zope.event',
+            'zope.exceptions',
+            'zope.filerepresentation',
+            'zope.formlib',
+            'zope.hookable',
+            'zope.i18n',
+            'zope.i18nmessageid',
+            'zope.processlifetime',
+            'zope.componentvocabulary',
+            'zope.lifecycleevent',
+            'zope.location',
+            'zope.minmax',
+            'zope.pagetemplate',
+            'zope.proxy',
+            'zope.publisher',
+            'zope.session',
+            'zope.site',
+            'zope.size',
+            'zope.tal',
+            'zope.tales',
+            'zope.testing',
+            'zope.traversing',
             ],
         ),
     install_requires = [

Modified: z3c.recipe.paster/trunk/src/z3c/recipe/paster/paster.py
===================================================================
--- z3c.recipe.paster/trunk/src/z3c/recipe/paster/paster.py	2009-06-08 07:31:12 UTC (rev 100731)
+++ z3c.recipe.paster/trunk/src/z3c/recipe/paster/paster.py	2009-06-08 07:37:20 UTC (rev 100732)
@@ -16,7 +16,6 @@
 $Id:$
 """
 
-import os
 import zc.recipe.egg
 
 

Modified: z3c.recipe.paster/trunk/src/z3c/recipe/paster/serve.py
===================================================================
--- z3c.recipe.paster/trunk/src/z3c/recipe/paster/serve.py	2009-06-08 07:31:12 UTC (rev 100731)
+++ z3c.recipe.paster/trunk/src/z3c/recipe/paster/serve.py	2009-06-08 07:37:20 UTC (rev 100732)
@@ -17,8 +17,6 @@
 """
 
 import os
-import sys
-import shutil
 import cStringIO
 import ZConfig.schemaless
 import zc.buildout

Modified: z3c.recipe.paster/trunk/src/z3c/recipe/paster/tests.py
===================================================================
--- z3c.recipe.paster/trunk/src/z3c/recipe/paster/tests.py	2009-06-08 07:31:12 UTC (rev 100731)
+++ z3c.recipe.paster/trunk/src/z3c/recipe/paster/tests.py	2009-06-08 07:37:20 UTC (rev 100732)
@@ -26,15 +26,14 @@
 
 def setUp(test):
     zc.buildout.testing.buildoutSetUp(test)
-    zc.buildout.testing.install_develop('z3c.recipe.paster', test)
     zc.buildout.testing.install('Paste', test)
     zc.buildout.testing.install('PasteDeploy', test)
     zc.buildout.testing.install('PasteScript', test)
     zc.buildout.testing.install('RestrictedPython', test)
-    zc.buildout.testing.install('transaction', test)
     zc.buildout.testing.install('ZConfig', test)
     zc.buildout.testing.install('ZODB3', test)
     zc.buildout.testing.install('pytz', test)
+    zc.buildout.testing.install('transaction', test)
     zc.buildout.testing.install('zc.lockfile', test)
     zc.buildout.testing.install('zc.recipe.egg', test)
     zc.buildout.testing.install('zc.recipe.filestorage', test)
@@ -43,10 +42,6 @@
     zc.buildout.testing.install('zope.annotation', test)
     zc.buildout.testing.install('zope.app.applicationcontrol', test)
     zc.buildout.testing.install('zope.app.appsetup', test)
-    zc.buildout.testing.install('zope.authentication', test)
-    zc.buildout.testing.install('zope.principalregistry', test)
-    zc.buildout.testing.install('zope.app.localpermission', test)
-    zc.buildout.testing.install('zope.password', test)
     zc.buildout.testing.install('zope.app.basicskin', test)
     zc.buildout.testing.install('zope.app.component', test)
     zc.buildout.testing.install('zope.app.container', test)
@@ -55,15 +50,18 @@
     zc.buildout.testing.install('zope.app.form', test)
     zc.buildout.testing.install('zope.app.http', test)
     zc.buildout.testing.install('zope.app.interface', test)
+    zc.buildout.testing.install('zope.app.localpermission', test)
     zc.buildout.testing.install('zope.app.pagetemplate', test)
     zc.buildout.testing.install('zope.app.publication', test)
     zc.buildout.testing.install('zope.app.publisher', test)
     zc.buildout.testing.install('zope.app.security', test)
     zc.buildout.testing.install('zope.app.wsgi', test)
+    zc.buildout.testing.install('zope.authentication', test)
+    zc.buildout.testing.install('zope.broken', test)
     zc.buildout.testing.install('zope.browser', test)
-    zc.buildout.testing.install('zope.broken', test)
     zc.buildout.testing.install('zope.cachedescriptors', test)
     zc.buildout.testing.install('zope.component', test)
+    zc.buildout.testing.install('zope.componentvocabulary', test)
     zc.buildout.testing.install('zope.configuration', test)
     zc.buildout.testing.install('zope.container', test)
     zc.buildout.testing.install('zope.contenttype', test)
@@ -87,6 +85,9 @@
     zc.buildout.testing.install('zope.location', test)
     zc.buildout.testing.install('zope.minmax', test)
     zc.buildout.testing.install('zope.pagetemplate', test)
+    zc.buildout.testing.install('zope.password', test)
+    zc.buildout.testing.install('zope.principalregistry', test)
+    zc.buildout.testing.install('zope.processlifetime', test)
     zc.buildout.testing.install('zope.proxy', test)
     zc.buildout.testing.install('zope.publisher', test)
     zc.buildout.testing.install('zope.schema', test)
@@ -98,15 +99,17 @@
     zc.buildout.testing.install('zope.tales', test)
     zc.buildout.testing.install('zope.testing', test)
     zc.buildout.testing.install('zope.traversing', test)
+    zc.buildout.testing.install_develop('z3c.recipe.paster', test)
 
 
 checker = renormalizing.RENormalizing([
     zc.buildout.testing.normalize_path,
-    (re.compile(
-    "Couldn't find index page for '[a-zA-Z0-9.]+' "
-    "\(maybe misspelled\?\)"
-    "\n"
-    ), ''),
+    # note sure if misspelled?) has \n at the end on linux?
+    (re.compile("Couldn't find index page for '[a-zA-Z0-9.]+' "
+     "\(maybe misspelled\?\)\n"), ''),
+    # windows doesn't have \n at the end of misspelled?)
+    (re.compile("Couldn't find index page for '[a-zA-Z0-9.]+' "
+     "\(maybe misspelled\?\)"), ''),
     (re.compile("""['"][^\n"']+z3c.recipe.paster[^\n"']*['"],"""),
      "'/z3c.recipe.paster',"),
     (re.compile('#![^\n]+\n'), ''),