File tree Expand file tree Collapse file tree 1 file changed +15
-5
lines changed Expand file tree Collapse file tree 1 file changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -69,18 +69,28 @@ def skip_entire_test_file?
69
69
70
70
def skip_version? ( client , skip_definition )
71
71
return true if skip_definition [ 'version' ] == 'all'
72
-
73
- range_partition = /\s *-\s */
74
72
return unless ( versions = skip_definition [ 'version' ] )
75
73
76
- low , high = __parse_versions ( versions . partition ( range_partition ) )
77
- range = low ..high
78
74
begin
79
75
server_version = client . info [ 'version' ] [ 'number' ]
80
76
rescue
81
77
warn ( 'Could not determine Elasticsearch version when checking if test should be skipped.' )
82
78
end
83
- range . cover? ( Gem ::Version . new ( server_version ) )
79
+
80
+ range_partition = /\s *-\s */
81
+
82
+ if versions . include? ( ',' )
83
+ # == " - 7.17.3, 8.0.0 - 8.2.99"
84
+ versions . split ( ',' ) . each do |version_range |
85
+ low , high = __parse_versions ( version_range . partition ( range_partition ) )
86
+ range = low ..high
87
+ return true if range . cover? ( Gem ::Version . new ( server_version ) )
88
+ end
89
+ else
90
+ low , high = __parse_versions ( versions . partition ( range_partition ) )
91
+ range = low ..high
92
+ range . cover? ( Gem ::Version . new ( server_version ) )
93
+ end
84
94
end
85
95
86
96
def __parse_versions ( versions )
You can’t perform that action at this time.
0 commit comments