[Checkins] SVN: z3c.recipe.paster/trunk/ - Fixed tests to run with current package versions and ``distribute``.

[Michael Howitz]

Log message for revision 116209:
  - Fixed tests to run with current package versions and ``distribute``.
  
  - Using python's ``doctest`` module instead of deprecated ``zope.testing.doctest``.
  

Changed:
  U   z3c.recipe.paster/trunk/CHANGES.txt
  U   z3c.recipe.paster/trunk/src/z3c/recipe/paster/README.txt
  U   z3c.recipe.paster/trunk/src/z3c/recipe/paster/debug.txt
  U   z3c.recipe.paster/trunk/src/z3c/recipe/paster/paster.txt
  U   z3c.recipe.paster/trunk/src/z3c/recipe/paster/tests.py

-=-
Modified: z3c.recipe.paster/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.paster/trunk/CHANGES.txt	2010-09-06 13:04:40 UTC (rev 116208)
+++ z3c.recipe.paster/trunk/CHANGES.txt	2010-09-07 07:06:31 UTC (rev 116209)
@@ -3,10 +3,13 @@
 =======
 
 0.5.4dev (unreleased)
-------------------
+---------------------
 
-- ...
+- Fixed tests to run with current package versions and ``distribute``.
 
+- Using python's ``doctest`` module instead of deprecated
+  ``zope.testing.doctest``.
+
 0.5.3 (2010-02-08)
 ------------------
 

Modified: z3c.recipe.paster/trunk/src/z3c/recipe/paster/README.txt
===================================================================
--- z3c.recipe.paster/trunk/src/z3c/recipe/paster/README.txt	2010-09-06 13:04:40 UTC (rev 116208)
+++ z3c.recipe.paster/trunk/src/z3c/recipe/paster/README.txt	2010-09-07 07:06:31 UTC (rev 116209)
@@ -96,7 +96,6 @@
 
   >>> print system(join('bin', 'buildout')),
   Develop: '/sample-buildout/demo'
-  Couldn't find index page for 'wsgi_intercept' (maybe misspelled?)
   Installing var.
   Installing myapp.
   Generated script '/sample-buildout/bin/myapp'.

Modified: z3c.recipe.paster/trunk/src/z3c/recipe/paster/debug.txt
===================================================================
--- z3c.recipe.paster/trunk/src/z3c/recipe/paster/debug.txt	2010-09-06 13:04:40 UTC (rev 116208)
+++ z3c.recipe.paster/trunk/src/z3c/recipe/paster/debug.txt	2010-09-07 07:06:31 UTC (rev 116209)
@@ -91,12 +91,10 @@
 
   >>> print system(join('bin', 'buildout')),
   Develop: '/sample-buildout/sample'
-  Couldn't find index page for 'wsgi_intercept' (maybe misspelled?)
   Installing var.
   Installing myapp.
   Generated script '/sample-buildout/bin/myapp'.
   Installing mydebug.
-  Couldn't find index page for 'wsgi_intercept' (maybe misspelled?)
   Generated script '/sample-buildout/bin/mydebug'.
 
 Now check if the setup was correct:

Modified: z3c.recipe.paster/trunk/src/z3c/recipe/paster/paster.txt
===================================================================
--- z3c.recipe.paster/trunk/src/z3c/recipe/paster/paster.txt	2010-09-06 13:04:40 UTC (rev 116208)
+++ z3c.recipe.paster/trunk/src/z3c/recipe/paster/paster.txt	2010-09-07 07:06:31 UTC (rev 116209)
@@ -74,7 +74,6 @@
 
   >>> print system(join('bin', 'buildout')),
   Develop: '/sample-buildout/sample'
-  Couldn't find index page for 'wsgi_intercept' (maybe misspelled?)
   Installing mypaster.
   Generated script '/sample-buildout/bin/mypaster'.
 

Modified: z3c.recipe.paster/trunk/src/z3c/recipe/paster/tests.py
===================================================================
--- z3c.recipe.paster/trunk/src/z3c/recipe/paster/tests.py	2010-09-06 13:04:40 UTC (rev 116208)
+++ z3c.recipe.paster/trunk/src/z3c/recipe/paster/tests.py	2010-09-07 07:06:31 UTC (rev 116209)
@@ -11,15 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Tests
-
-$Id:$
-"""
-
+from zope.testing import renormalizing
+import doctest
 import re
 import unittest
-from zope.testing import doctest
-from zope.testing import renormalizing
 import zc.buildout.testing
 
 
@@ -89,9 +84,12 @@
      "'/z3c.recipe.paster',"),
     (re.compile('#![^\n]+\n'), ''),
     (re.compile('-\S+-py\d[.]\d(-\S+)?.egg'), '-pyN.N.egg'),
+    # distribute prints the install_dir which pollutes the test output:
+    (re.compile('install_dir .*'), ''),
     # the following are for compatibility with Windows
     (re.compile('-  .*\.exe\n'), ''),
     (re.compile('-script.py'), ''),
+
     ])