github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

don't rely on expect match and last_match in qa test

Browse source 
Fixes #11273
This commit is contained in:
Joao Duarte 2019-10-26 19:55:14 +01:00 • committed by João Duarte
parent 1f14cba3e3
commit 81e7b18b25
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qa/acceptance/spec/shared_examples/cli/logstash-plugin/list.rb
View file

@ -33,7 +33,8 @@ shared_examples "logstash list" do |logstash|
stdout = StringIO.new(result.stdout) stdout = StringIO.new(result.stdout)
stdout.set_encoding(Encoding::UTF_8) stdout.set_encoding(Encoding::UTF_8)
while line = stdout.gets while line = stdout.gets
expect(line).to match(/^#{plugin_name_with_version}$/) match = line.match(/^#{plugin_name_with_version}$/)
expect(match).to_not be_nil
# Integration Plugins list their sub-plugins, e.g., # Integration Plugins list their sub-plugins, e.g.,
# ~~~ # ~~~
@ -41,9 +42,10 @@ shared_examples "logstash list" do |logstash|
# ├── logstash-input-kafka # ├── logstash-input-kafka
# └── logstash-output-kafka # └── logstash-output-kafka
# ~~~ # ~~~
if Regexp.last_match[:type] == 'integration' if match[:type] == 'integration'
while line = stdout.gets while line = stdout.gets
expect(line).to match(/^(?: [├└]── )#{plugin_name}$/) match = line.match(/^(?: [├└]── )#{plugin_name}$/)
expect(match).to_not be_nil
break if line.start_with?(' └') break if line.start_with?(' └')
end end
end end