From 99c91b7b5c9e1640269a63bcf59aa2616d19d47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Thu, 14 Jul 2016 17:29:16 +0200 Subject: [PATCH] Skip in yaml tests can have multiple values --- test_elasticsearch/test_server/test_common.py | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/test_elasticsearch/test_server/test_common.py b/test_elasticsearch/test_server/test_common.py index 81933a77..a9a5559b 100644 --- a/test_elasticsearch/test_server/test_common.py +++ b/test_elasticsearch/test_server/test_common.py @@ -152,15 +152,19 @@ class YamlTestCase(ElasticsearchTestCase): def run_skip(self, skip): if 'features' in skip: - if skip['features'] in IMPLEMENTED_FEATURES: - return - elif skip['features'] == 'requires_replica': - if self._get_data_nodes() > 1: - return - elif skip['features'] == 'benchmark': - if self._get_benchmark_nodes(): - return - raise SkipTest(skip.get('reason', 'Feature %s is not supported' % skip['features'])) + features = skip['features'] + if not isinstance(features, (tuple, list)): + features = [features] + for feature in features: + if feature in IMPLEMENTED_FEATURES: + continue + elif feature == 'requires_replica': + if self._get_data_nodes() > 1: + 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: version, reason = skip['version'], skip['reason']