x/cloud-init
Code Issues Proposed changes

Adjust detection of python versions and variables exposed

Browse Source
This commit is contained in:
Joshua Harlow 2014-02-07 16:40:51 -08:00
parent 16be954cd6
commit da5948e897
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/unittests/helpers.py
View File

@ -12,10 +12,27 @@ from cloudinit import util
import shutil import shutil
# Handle how 2.6 doesn't have the assertIn or assertNotIn # Used for detecting different python versions
PY2 = False
PY26 = False
PY27 = False
PY3 = False
_PY_VER = sys.version_info _PY_VER = sys.version_info
_PY_MAJOR, _PY_MINOR = _PY_VER[0:2] _PY_MAJOR, _PY_MINOR = _PY_VER[0:2]
if (_PY_MAJOR, _PY_MINOR) <= (2, 6): if (_PY_MAJOR, _PY_MINOR) <= (2, 6):
if (_PY_MAJOR, _PY_MINOR) == (2, 6):
PY26 = True
if (_PY_MAJOR, _PY_MINOR) >= (2, 0):
PY2 = True
else:
if (_PY_MAJOR, _PY_MINOR) == (2, 7):
PY27 = True
PY2 = True
if (_PY_MAJOR, _PY_MINOR) >= (3, 0):
PY3 = True
if PY26:
# For now add these on, taken from python 2.7 + slightly adjusted # For now add these on, taken from python 2.7 + slightly adjusted
class TestCase(unittest.TestCase): class TestCase(unittest.TestCase):
def assertIn(self, member, container, msg=None): def assertIn(self, member, container, msg=None):