[Checkins] SVN: zc.buildout/trunk/src/zc/buildout/tests.py Tweaks to deal with output differences between windows and unix.

Jim Fulton jim at zope.com
Wed Jun 20 14:24:53 EDT 2007


Log message for revision 76853:
  Tweaks to deal with output differences between windows and unix.
  

Changed:
  U   zc.buildout/trunk/src/zc/buildout/tests.py

-=-
Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py	2007-06-20 18:23:54 UTC (rev 76852)
+++ zc.buildout/trunk/src/zc/buildout/tests.py	2007-06-20 18:24:52 UTC (rev 76853)
@@ -526,9 +526,9 @@
     >>> import zc.buildout.easy_install
     >>> ws = zc.buildout.easy_install.working_set(
     ...    ['demo'], sys.executable, ['develop-eggs'])
-    >>> zc.buildout.easy_install.scripts(
-    ...    ['demo'], ws, sys.executable, 'bin')
-    ['bin/demo']
+    >>> bool(zc.buildout.easy_install.scripts(
+    ...      ['demo'], ws, sys.executable, 'bin'))
+    True
 
     >>> print system(join('bin', 'demo')),
     Python 2.5
@@ -1789,7 +1789,7 @@
         ... parts = x
         ... ''')
 
-        >>> call(buildout)
+        >>> call(buildout) # doctest: +NORMALIZE_WHITESPACE
         While:
           Installing.
           Getting section x.
@@ -1819,7 +1819,7 @@
         ... recipe = zc.buildout.testexit
         ... ''')
 
-        >>> call(buildout)
+        >>> call(buildout) # doctest: +NORMALIZE_WHITESPACE
         Develop: '/sample-buildout/.'
         While:
           Installing.
@@ -2280,7 +2280,7 @@
                 'Picked: \\1 = V.V'),
                (re.compile(r'We have a develop egg: zc.buildout (\S+)'),
                 'We have a develop egg: zc.buildout X.X.'),
-               
+               (re.compile(r'\\[\\]?'), '/'),
                ])
             ),
         doctest.DocFileSuite(
@@ -2346,7 +2346,7 @@
                 r'We have a develop egg: \1 V'),
                (re.compile('Picked: setuptools = \S+'),
                 'Picked: setuptools = V'),
-               
+               (re.compile(r'\\[\\]?'), '/'),               
                ]),
             ),
         ))



More information about the Checkins mailing list