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

Skip in yaml tests can have multiple values

Browse Source
This commit is contained in:
Honza Král
2016-07-14 17:29:16 +02:00
parent fb8b55284a
commit 99c91b7b5c
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test_elasticsearch/test_server/test_common.py
+13 -9
View File
@@ -152,15 +152,19 @@ class YamlTestCase(ElasticsearchTestCase):
def run_skip(self, skip): def run_skip(self, skip):
if 'features' in skip: if 'features' in skip:
if skip['features'] in IMPLEMENTED_FEATURES: features = skip['features']
return if not isinstance(features, (tuple, list)):
elif skip['features'] == 'requires_replica': features = [features]
if self._get_data_nodes() > 1: for feature in features:
return if feature in IMPLEMENTED_FEATURES:
elif skip['features'] == 'benchmark': continue
if self._get_benchmark_nodes(): elif feature == 'requires_replica':
return if self._get_data_nodes() > 1:
raise SkipTest(skip.get('reason', 'Feature %s is not supported' % skip['features'])) continue
elif feature == 'benchmark':
if self._get_benchmark_nodes():
continue
raise SkipTest(skip.get('reason', 'Feature %s is not supported' % feature))
if 'version' in skip: if 'version' in skip:
version, reason = skip['version'], skip['reason'] version, reason = skip['version'], skip['reason']