Skip to content

Commit 21806c4

Browse files
committed
[XPACK] Fix skip test logic
1 parent 49ff309 commit 21806c4

File tree

1 file changed

+9
-4
lines changed
  • elasticsearch-xpack/spec/support/test_file

1 file changed

+9
-4
lines changed

elasticsearch-xpack/spec/support/test_file/test.rb

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class Test
3030
'is_true'
3131
].freeze
3232

33+
3334
# The maximum Elasticsearch version this client version can successfully run tests against.
3435
#
3536
# @since 6.1.1
@@ -143,11 +144,15 @@ def skip_test?(client, features_to_skip = test_file.skip_features)
143144
return false if @skip.empty?
144145
range_partition = /\s*-\s*/
145146
@skip.collect { |s| s['skip'] }.any? do |skip|
146-
if versions = skip['version'].partition(range_partition)
147-
range = versions[0]..versions[2]
147+
if features_to_skip.include?(skip['features'])
148+
true
149+
elsif skip['version'] == 'all'
150+
true
151+
elsif versions = skip['version'].partition(range_partition)
152+
low = versions[0]
153+
high = versions[2] unless versions[2] == ''
154+
range = low..high
148155
range.cover?(client.info['version']['number'])
149-
else
150-
features_to_skip.include?(skip['features']) || skip['version'] == 'all'
151156
end
152157
end
153158
rescue

0 commit comments

Comments
 (0)