Updating test cases

Signed-off-by: paragchak-sumo <[email protected]>

Author: paragchak-sumo

spec/acceptance/00_backend_spec.rb

@@ -30,6 +30,9 @@ class { 'sensu::backend':
       it { should be_enabled }
       it { should be_running }
     end
+    it 'waits for backend to be healthy' do
+      expect(wait_for_backend(node)).to eq(true)
+    end
     describe package('sensu-go-agent'), :node => node do
       it { should_not be_installed }
     end

spec/acceptance/01_agent_spec.rb

@@ -77,6 +77,10 @@ class { 'sensu::agent':
       it { should be_listening }
     end
 
+    it 'waits for backend before inspecting entity' do
+      expect(wait_for_backend(backend)).to eq(true)
+    end
+
     it 'should create an entity' do
       on backend, "sensuctl entity info sensu-agent --format json" do
         data = JSON.parse(stdout)

spec/acceptance/03_no_ssl_spec.rb

@@ -39,6 +39,9 @@ class { 'sensu::backend': }
     describe command('sensuctl entity list'), :node => backend do
       its(:exit_status) { should eq 0 }
     end
+    it 'waits for backend to be healthy' do
+      expect(wait_for_backend(backend)).to eq(true)
+    end
   end
 
   context 'agent' do

spec/acceptance/07_cli_spec.rb

@@ -41,6 +41,7 @@ class { 'sensu::backend': }
     end
 
     it 'should have working sensuctl' do
+      expect(wait_for_backend(backend)).to eq(true)
       exit_code = on(node, 'sensuctl cluster health').exit_code
       expect(exit_code).to eq(0)
     end
@@ -80,6 +81,7 @@ class { 'sensu::backend': }
     end
 
     it 'should have working sensuctl' do
+      expect(wait_for_backend(backend)).to eq(true)
       exit_code = on(node, 'sensuctl cluster health').exit_code
       expect(exit_code).to eq(0)
     end
@@ -121,6 +123,7 @@ class { 'sensu::backend': }
     end
 
     it 'should have working sensuctl' do
+      expect(wait_for_backend(backend)).to eq(true)
       exit_code = on(node, 'sensuctl cluster health').exit_code
       expect(exit_code).to eq(0)
     end

spec/spec_helper_acceptance.rb

@@ -11,6 +11,22 @@
 collection = ENV['BEAKER_PUPPET_COLLECTION'] || 'puppet6'
 project_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..'))
 
+# Wait helpers to accommodate slower startup on newer Sensu versions
+def wait_for_command(host, command, max_retries = 30, sleep_seconds = 5)
+  retries = 0
+  until retries >= max_retries
+    result = on(host, command, acceptable_exit_codes: [0,1,2,3,4,5,6], silent: true) rescue nil
+    return true if result && result.exit_code == 0
+    sleep sleep_seconds
+    retries += 1
+  end
+  false
+end
+
+def wait_for_backend(host)
+  wait_for_command(host, 'sensuctl cluster health')
+end
+
 RSpec.configure do |c|
   c.add_setting :sensu_mode, default: 'base'
   c.add_setting :sensu_enterprise_file, default: nil