From db5ed8ba4964e487f9a469e0c3c9556c5f8e8bb4 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Fri, 2 Sep 2016 08:28:31 +0000 Subject: [PATCH] Revert "Save error status if err data is present in dhcp checker response" This reverts commit d6a40e059011ee3ba3621560982ae473c1181ebe. Also, this change pins activesupport gem version used for ruby 2.1.5 Change-Id: I4002b11fe7716a38ff2321643a8bad9af9de3fa0 Closes-Bug: #1619621 Signed-off-by: Maksim Malchuk --- Gemfile | 1 + lib/astute/network.rb | 3 +-- spec/unit/network_spec.rb | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 25d4f69c..2ecc50f2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ source 'https://rubygems.org' gem 'raemon', :git => 'https://github.com/pressly/raemon', :ref => 'b78eaae57c8e836b8018386dd96527b8d9971acc' +gem 'activesupport', '4.2.6', :require => 'false' gemspec diff --git a/lib/astute/network.rb b/lib/astute/network.rb index 2ac3fa1e..e41c952d 100644 --- a/lib/astute/network.rb +++ b/lib/astute/network.rb @@ -223,8 +223,7 @@ module Astute if response.results[:data][:out].present? Astute.logger.debug("DHCP checker received:\n#{response.pretty_inspect}") node_result[:data] = JSON.parse(response.results[:data][:out]) - end - if response.results[:data][:err].present? + elsif response.results[:data][:err].present? Astute.logger.debug("DHCP checker errred with:\n#{response.pretty_inspect}") node_result[:status] = 'error' node_result[:error_msg] = 'Error in dhcp checker. Check logs for details' diff --git a/spec/unit/network_spec.rb b/spec/unit/network_spec.rb index 52001099..3116eb76 100644 --- a/spec/unit/network_spec.rb +++ b/spec/unit/network_spec.rb @@ -137,9 +137,8 @@ describe Astute::Network do mock_and_verify_check_dhcp(nodes, [res1, res2], expected) # check case when the check failed for one of the nodes - err_res = mock_mc_result({:sender => "1", - :data => {:out => json_output, :err => 'Test err'}}) - expected = {"nodes" => [{:uid => "1", :status => "error", :data=>expected_data, + err_res = mock_mc_result({:sender => "1", :data => {:err => 'Test err'}}) + expected = {"nodes" => [{:uid => "1", :status => "error", :error_msg => "Error in dhcp checker. Check logs for details"}], "status" => "error"} mock_and_verify_check_dhcp([nodes[0]], [err_res], expected)