Merge pull request vinibaggio#8 from brain-geek/master

Fix for annoying error if host is not accessible by ping
marlonglopes · Dec 18, 2011 · 4d5140d · 4d5140d
2 parents a69e004 + f20750a
commit 4d5140d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/outpost/expectations/response_time.rb b/lib/outpost/expectations/response_time.rb
@@ -21,7 +21,7 @@ def self.extended(base)
       # Method that will be used as an expectation to evaluate response time
       def evaluate_response_time(scout, rules)
         rules.all? do |rule, comparison|
-          comparison && scout.response_time.send(RESPONSE_TIME_MAPPING[rule], comparison)
+          scout.response_time.nil? ? false : scout.response_time.send(RESPONSE_TIME_MAPPING[rule], comparison)
         end
       end
     end

diff --git a/test/outpost/expectations/response_time_test.rb b/test/outpost/expectations/response_time_test.rb
@@ -16,7 +16,8 @@ def expect(expectation, evaluation_method)
 
   describe ".evaluation_response_time with nil" do
     it "should fail gracefully" do
-      refute SubjectTime.evaluate_response_time(scout_stub, :less_than => nil)
+      #this is common, as host can be not accessible for ping
+      refute SubjectTime.evaluate_response_time(build_stub(:response_time => nil), :less_than => 400)
     end
   end