[Checkins] SVN: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/ A change in revision 105585 caused selecting-python.txt test to

Jim Fulton jim at zope.com
Sun Feb 28 13:10:14 EST 2010


Log message for revision 109504:
  A change in revision 105585 caused selecting-python.txt test to
  fail. The change had to do with the way setuptools was installed.
  This seems to explain the changed test output, which is incidental to
  what's tested. This test *was* only run for Python 2.5.
  
  I've changed the test to run whenever Python 2.4 isn't used and
  updated the test to reflect the new output.
  

Changed:
  U   zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
  U   zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py

-=-
Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt	2010-02-28 18:02:06 UTC (rev 109503)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt	2010-02-28 18:10:13 UTC (rev 109504)
@@ -55,8 +55,6 @@
    Getting distribution for 'demo<0.3'.
    Got demo 0.2.
    Getting distribution for 'demoneeded'.
-   Getting distribution for 'setuptools'.
-   Got setuptools 0.6.
    Got demoneeded 1.2c1.
    Generated script '/sample-buildout/bin/demo'.
    Generated interpreter '/sample-buildout/bin/py-demo'.
@@ -66,7 +64,6 @@
     >>> ls(sample_buildout, 'eggs')
     -  demo-0.2-py2.4.egg
     -  demoneeded-1.2c1-py2.4.egg
-    d  setuptools-0.6-py2.4.egg
     d  setuptools-0.6-py2.5.egg
     -  zc.buildout-1.0-py2.5.egg
 

Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py	2010-02-28 18:02:06 UTC (rev 109503)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py	2010-02-28 18:10:13 UTC (rev 109504)
@@ -92,7 +92,7 @@
 
         ))
 
-    if sys.version_info[:2] == (2, 5):
+    if sys.version_info[:2] != (2, 4):
         # Only run selecting python tests if not 2.4, since
         # 2.4 is the alternate python used in the tests.
         suite.addTest(



More information about the checkins mailing list