another test passing w 3.2

buildout · Jun 24, 2012 · 44046ba · 44046ba
1 parent 1c4772b
commit 44046ba
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/zc.recipe.egg_/src/zc/recipe/egg/custom.txt b/zc.recipe.egg_/src/zc/recipe/egg/custom.txt
@@ -131,9 +131,8 @@ the egg:
     ...
     ... """ % dict(server=link_server))
 
-    >>> print_(system(buildout), end='')
-    Installing extdemo.
-    zip_safe flag not set; analyzing archive contents...
+    >>> print_(system(buildout), end='') # doctest: +ELLIPSIS
+    Installing extdemo...
 
 We got the zip_safe warning because the source distribution we used
 wasn't setuptools based and thus didn't set the option.
@@ -158,7 +157,7 @@ Let's define a script that uses out ext demo:
     ... """
     ... import extdemo, sys
     ... def print_(*args):
-    ...     sys.stdout.write(' '.join(map(str, args)) + '\n')
+    ...     sys.stdout.write(' '.join(map(str, args)) + '\\n')
     ... def main():
     ...     print_(extdemo.val)
     ... """)

diff --git a/zc.recipe.egg_/src/zc/recipe/egg/tests.py b/zc.recipe.egg_/src/zc/recipe/egg/tests.py
@@ -78,24 +78,31 @@ def test_suite():
             'custom.txt',
             setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
             checker=renormalizing.RENormalizing([
-               zc.buildout.testing.normalize_path,
-               zc.buildout.testing.normalize_endings,
-               (re.compile("(d  ((ext)?demo(needed)?|other)"
-                           "-\d[.]\d-py)\d[.]\d(-\S+)?[.]egg"),
-                '\\1V.V.egg'),
-               (re.compile('extdemo.c\n.+\\extdemo.exp\n'), ''),
-               (re.compile('extdemo[.]pyd'), 'extdemo.so'),
-               (re.compile(
-                   "extdemo[.]c\n"
-                   "extdemo[.]obj : warning LNK4197: "
-                   "export 'initextdemo' specified multiple times; "
-                   "using first specification\n"
-                   "   Creating library build\\\\temp[.]win-amd64-2[.]"
-                   "[4567]\\\\Release\\\\extdemo[.]lib and object "
-                   "build\\\\temp[.]win-amd64-2[.][4567]\\\\Re"
-                   "lease\\\\extdemo[.]exp\n"),
-                ''),
-               ]),
+                zc.buildout.testing.normalize_path,
+                zc.buildout.testing.normalize_endings,
+                (re.compile("(d  ((ext)?demo(needed)?|other)"
+                            "-\d[.]\d-py)\d[.]\d(-\S+)?[.]egg"),
+                 '\\1V.V.egg'),
+                (re.compile('extdemo.c\n.+\\extdemo.exp\n'), ''),
+                (re.compile('extdemo[.]pyd'), 'extdemo.so'),
+                (re.compile(
+                    r'zip_safe flag not set; analyzing archive contents.*\n'),
+                 ''),
+                (re.compile(
+                    r'\n.*module references __file__'),
+                 ''),
+                (re.compile(''), ''),
+                (re.compile(
+                    "extdemo[.]c\n"
+                    "extdemo[.]obj : warning LNK4197: "
+                    "export 'initextdemo' specified multiple times; "
+                    "using first specification\n"
+                    "   Creating library build\\\\temp[.]win-amd64-2[.]"
+                    "[4567]\\\\Release\\\\extdemo[.]lib and object "
+                    "build\\\\temp[.]win-amd64-2[.][4567]\\\\Re"
+                    "lease\\\\extdemo[.]exp\n"),
+                 ''),
+                ]),
             ),
         ))
     return suite