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

YamlTestCase fixes

Browse Source
This commit is contained in:
Honza Kral
2013-07-12 18:22:06 +02:00
parent 44ee8b6e82
commit 2468accd29
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test_elasticsearch/test_server/test_common.py
+6 -3
View File
@@ -25,6 +25,7 @@ class InvalidActionType(Exception):
class YamlTestCase(TestCase): class YamlTestCase(TestCase):
_definition = None
@property @property
def es_version(self): def es_version(self):
global ES_VERSION global ES_VERSION
@@ -43,6 +44,8 @@ class YamlTestCase(TestCase):
self.client.indices.delete() self.client.indices.delete()
def test_from_yaml(self): def test_from_yaml(self):
if not self._definition:
raise SkipTest('Empty test.')
for test in self._definition: for test in self._definition:
for name, definition in test.items(): for name, definition in test.items():
self.run_code(definition) self.run_code(definition)
@@ -117,9 +120,9 @@ 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.split('.'))) min_version = tuple(map(int, min_version.strip().split('.')))
max_version = tuple(map(int, max_version.split('.'))) max_version = tuple(map(int, max_version.strip().split('.')))
if min_version <= self.es_version <= max_version: if min_version <= self.es_version <= max_version:
raise SkipTest(reason) raise SkipTest(reason)