libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject svn commit: r1439246 - /libcloud/trunk/setup.py
Date Mon, 28 Jan 2013 04:07:11 GMT
Author: tomaz
Date: Mon Jan 28 04:07:10 2013
New Revision: 1439246

URL: http://svn.apache.org/viewvc?rev=1439246&view=rev
Log:
Disable ssh_client tests on Python 2.5 on buildbot.

Modified:
    libcloud/trunk/setup.py

Modified: libcloud/trunk/setup.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/setup.py?rev=1439246&r1=1439245&r2=1439246&view=diff
==============================================================================
--- libcloud/trunk/setup.py (original)
+++ libcloud/trunk/setup.py Mon Jan 28 04:07:10 2013
@@ -51,6 +51,9 @@ if sys.version_info <= (2, 4):
           ', '.join(SUPPORTED_VERSIONS))
     sys.exit(1)
 
+# pre-2.6 will need the ssl PyPI package
+pre_python26 = (sys.version_info[0] == 2 and sys.version_info[1] < 6)
+
 
 def read_version_string():
     version = None
@@ -106,8 +109,6 @@ class TestCommand(Command):
             print("Please copy the new secret.py-dist file over otherwise" +
                   " tests might fail")
 
-        pre_python26 = (sys.version_info[0] == 2
-                        and sys.version_info[1] < 6)
         if pre_python26:
             missing = []
             # test for dependencies
@@ -130,6 +131,9 @@ class TestCommand(Command):
         testfiles = []
         for test_path in TEST_PATHS:
             for t in glob(pjoin(self._dir, test_path, 'test_*.py')):
+                if pre_python26 and 'test_ssh_client' in t:
+                    # TODO: Need to update mock library on buildslave
+                    continue
                 testfiles.append('.'.join(
                     [test_path.replace('/', '.'), splitext(basename(t))[0]]))
 
@@ -215,8 +219,6 @@ class CoverageCommand(Command):
         cov.save()
         cov.html_report()
 
-# pre-2.6 will need the ssl PyPI package
-pre_python26 = (sys.version_info[0] == 2 and sys.version_info[1] < 6)
 
 setup(
     name='apache-libcloud',



Mime
View raw message