actions/opensearch-pyd
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Version can contain non-number elements like beta etc

Browse Source
This commit is contained in:
Honza Kral
2013-07-23 20:43:05 +02:00
parent de7986ba00
commit bf23436c27
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test_elasticsearch/test_server/test_common.py
+6 -3
View File
@@ -23,6 +23,9 @@ ES_VERSION = None
class InvalidActionType(Exception): class InvalidActionType(Exception):
pass pass
def _get_version(version_string):
version = version_string.strip().split('.')
return tuple(int(v) if v.isdigit() else 999 for v in version)
class YamlTestCase(TestCase): class YamlTestCase(TestCase):
_definition = None _definition = None
@@ -31,7 +34,7 @@ class YamlTestCase(TestCase):
global ES_VERSION global ES_VERSION
if ES_VERSION is None: if ES_VERSION is None:
version_string = self.client.info()['version']['number'] version_string = self.client.info()['version']['number']
ES_VERSION = tuple(map(int, version_string.split('.'))) ES_VERSION = _get_version(version_string)
return ES_VERSION return ES_VERSION
def setUp(self): def setUp(self):
@@ -123,8 +126,8 @@ class YamlTestCase(TestCase):
def run_skip(self, skip): def run_skip(self, skip):
version, reason = skip['version'], skip['reason'] version, reason = skip['version'], skip['reason']
min_version, max_version = version.split('-') min_version, max_version = version.split('-')
min_version = tuple(map(int, min_version.strip().split('.'))) min_version = _get_version(min_version)
max_version = tuple(map(int, max_version.strip().split('.'))) max_version = _get_version(max_version)
if min_version <= self.es_version <= max_version: if min_version <= self.es_version <= max_version:
raise SkipTest(reason) raise SkipTest(reason)