From ed2989364af166454dc1e0139cdf8c47e132b1a4 Mon Sep 17 00:00:00 2001 From: Luis Blanco <ljblanco@redborder.com> Date: Fri, 16 Aug 2024 16:09:11 +0000 Subject: [PATCH] Revert "lint" This reverts commit f1299d167aee7550b142164f8333800a04e28dba. --- spec/services/logstash_spec.rb | 45 ++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/spec/services/logstash_spec.rb b/spec/services/logstash_spec.rb index f923d44..ca14d9a 100644 --- a/spec/services/logstash_spec.rb +++ b/spec/services/logstash_spec.rb @@ -15,24 +15,39 @@ describe "Checking service status for #{service}..." do regex = '^- pipeline\.id: .*-pipeline$' - has_pipelines = command("grep --perl-regex '#{regex}' #{PIPELINES_PATH}").exit_status == 0 - expected_state = has_pipelines ? :be_enabled : :not_be_enabled - expected_running = has_pipelines ? :be_running : :not_be_running - expected_listening = has_pipelines ? :be_listening : :not_be_listening - expected_installed = has_pipelines ? :be_installed : :not_be_installed - - describe service(service) do - it { should send(expected_state) } - it { should send(expected_running) } - end + has_pipelines = command("grep --perl-regex '#{regex}' #{PIPELINES_PATH}") + + unless has_pipelines.exit_status == 0 + describe service(service) do + it { should_not be_enabled } + it { should_not be_running } + end + describe port(port) do + it { should_not be_listening } + end + + packages.each do |package| + describe package(package) do + it { should_not be_installed } + end + end - describe port(port) do - it { should send(expected_listening) } end - packages.each do |package| - describe package(package) do - it { should send(expected_installed) } + if has_pipelines.exit_status == 0 + describe service(service) do + it { should be_enabled } + it { should be_running } + end + describe port(port) do + it { should be_listening } end + + packages.each do |package| + describe package(package) do + it { should be_installed } + end + end + end end