Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions qa/docker/shared_examples/container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,13 @@

it 'should run with the correct version' do
console_out = exec_in_container(@container, 'logstash --version')
console_filtered = console_out.split("\n")
.delete_if do |line|
line =~ /Using LS_JAVA_HOME defined java|Using system java: /
end.join
expect(console_filtered).to match /#{version}/
expect(console_out).to match /#{version}/
end

it 'should run with the bundled JDK' do
first_console_line = exec_in_container(@container, 'logstash --version').split("\n")[0]
expect(first_console_line).to match /Using bundled JDK: \/usr\/share\/logstash\/jdk/
full_command = exec_in_container_full(@container, 'logstash --version')
std_err = full_command[:stderr].join.chomp.strip
expect(std_err).to match /Using bundled JDK: \/usr\/share\/logstash\/jdk/
end

it 'should be running an API server on port 9600' do
Expand Down