[Erp5-report] r41426 kazuhiko - /erp5/trunk/buildout/tests/assertSoftware.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Dec 14 17:17:24 2010
New Revision: 41426

URL: http://svn.erp5.org?rev=41426&view=rev
Log:
try to detect if zope-2.8 flavour or not by the existense of parts/zope-2.8 directory, instead of sys.verison_info, because the applience test suite uses system python, not a python built by buildout.

# BBB it is adhoc, but all tests in this file will be soon merged into
# each buildout configuration. so please do not care.

Modified:
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=41426&r1=41425&r2=41426&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Tue Dec 14 17:17:24 2010
@@ -42,7 +42,14 @@ except NameError:
         return True
     return False
 
-python_version = '%s.%s' % util.sys.version_info[0:2]
+# checking if Zope-2.8 flavour or Zope-2.12 flavour
+# BBB it is adhoc, but all tests in this file will be soon merged into
+# each buildout configuration.
+parts_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
+if os.path.exists('%s/zope-2.8' % parts_dir):
+  python_version = '2.4'
+else:
+  python_version = '2.6'
 
 # List of libraries which are acceptable to be linked in globally
 ACCEPTABLE_GLOBAL_LIB_LIST = (