[Zope3-checkins] SVN: zdaemon/trunk/ Fixed test renormalizer that did not work in certain cases where the

[Stephan Richter]

Log message for revision 81261:
  Fixed test renormalizer that did not work in certain cases where the
  environment was complex.
  

Changed:
  U   zdaemon/trunk/CHANGES.txt
  U   zdaemon/trunk/setup.py
  U   zdaemon/trunk/src/zdaemon/tests/tests.py

-=-
Modified: zdaemon/trunk/CHANGES.txt
===================================================================
--- zdaemon/trunk/CHANGES.txt	2007-10-31 02:46:52 UTC (rev 81260)
+++ zdaemon/trunk/CHANGES.txt	2007-10-31 04:24:44 UTC (rev 81261)
@@ -1,6 +1,15 @@
 zdaemon Changelog
 *****************
 
+zdaemon 2.0.1 (2007/10/31)
+==========================
+
+Bugs Fixed
+----------
+
+Fixed test renormalizer that did not work in certain cases where the
+environment was complex.
+
 zdaemon 2.0.0 (2007/07/19)
 ==========================
 

Modified: zdaemon/trunk/setup.py
===================================================================
--- zdaemon/trunk/setup.py	2007-10-31 02:46:52 UTC (rev 81260)
+++ zdaemon/trunk/setup.py	2007-10-31 04:24:44 UTC (rev 81261)
@@ -68,5 +68,5 @@
        'Topic :: Utilities',
        'Operating System :: POSIX',
        ],
-    
+
     **setuptools_options)

Modified: zdaemon/trunk/src/zdaemon/tests/tests.py
===================================================================
--- zdaemon/trunk/src/zdaemon/tests/tests.py	2007-10-31 02:46:52 UTC (rev 81260)
+++ zdaemon/trunk/src/zdaemon/tests/tests.py	2007-10-31 04:24:44 UTC (rev 81261)
@@ -134,7 +134,7 @@
             setUp=setUp, tearDown=tearDown,
             checker=renormalizing.RENormalizing([
                 (re.compile('pid=\d+'), 'pid=NNN'),
-                (re.compile('^env\n((\w+=[^\n]*\n)+)$'), checkenv),
+                (re.compile('^env\n((?:.*\n)+)$'), checkenv),
                 ])
         ),
         ))