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

Fix new skipping logic in yaml tests

Browse Source
This commit is contained in:
Honza Král
2015-04-22 21:50:19 +02:00
parent 57ba820666
commit 47afab73ad
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/helpers/test.py
+2
View File
@@ -30,6 +30,8 @@ def get_test_client(nowait=False):
raise SkipTest("Elasticsearch failed to start.") raise SkipTest("Elasticsearch failed to start.")
def _get_version(version_string): def _get_version(version_string):
if '.' not in version_string:
return ()
version = version_string.strip().split('.') version = version_string.strip().split('.')
return tuple(int(v) if v.isdigit() else 999 for v in version) return tuple(int(v) if v.isdigit() else 999 for v in version)
test_elasticsearch/test_server/test_common.py
+2 -2
View File
@@ -152,8 +152,8 @@ class YamlTestCase(ElasticsearchTestCase):
if 'version' in skip: if 'version' in 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 = _get_version(min_version) min_version = _get_version(min_version) or (0, )
max_version = _get_version(max_version) max_version = _get_version(max_version) or (999, )
if min_version <= self.es_version <= max_version: if min_version <= self.es_version <= max_version:
raise SkipTest(reason) raise SkipTest(reason)