kapnismology 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29e92cc0b15350453a3ef92a2fd8299d66a3e3d9
-  data.tar.gz: b804388fb355e1afb4ccc6e41af8036808eb5e28
+  metadata.gz: cc04d3c658e30139dbf0adf893088832ba05706e
+  data.tar.gz: a0b1a9b1050c75aa6907b3cf17a63dd63020ee71
 SHA512:
-  metadata.gz: 0dda24022b80c738002ced4a8bab8475bf995d015ee07d1f6b6fc5f1a19f7f0414184e3fbbc5055ea4c11c22ee5197a490a83b492d16800f05a485609a6c1124
-  data.tar.gz: 912eb47c4d383ccffc1c49da32fbb954e57db7c0af55e8ebe70f79144f8669ad6fab1bf7ec37ccb06a5989d7ba7f935bc805e9fee1c43f33a5ec838e8d9896af
+  metadata.gz: 571e122ee54a4a433f02afc0c1b1d743d36c2eaada3375774dd454c0b0129826616171dfb1bad8862489bdcea4c26d5fadc2f8fc19e1e8b9d3f8f1d95adf32e9
+  data.tar.gz: 126db5d5528ef6b4ec271d63ab5180892db62a7263f9e69b54d6e4d462125d8c77aad047b200c7b38398a99a396456767d2f16dea5115f9c56f94ce4c6da9bad

data/README.md

@@ -120,6 +120,20 @@ It will run all your integration tests. You can run it together with your runtim
  wget http://myservice.com/smoke_test?tags=integration,runtime
 ```
 
+## Timing out
+
+Smoke tests will by default time out after 10 seconds. If you need to change this value overwrite the `timeout` method your smoke test class and return a new number (seconds). Returning `0` will prevent the test from timing out.
+
+```Ruby
+class SuperSlowTest < Kapnismology::SmokeTest
+  def result
+  end
+  def self.timeout
+    30
+  end
+end
+```
+
 
 ## Skipping tests
 

data/lib/kapnismology/smoke_test.rb

@@ -12,26 +12,23 @@ module Kapnismology
     RUNTIME_TAG = 'runtime'.freeze
     DEFAULT_TAGS = [DEPLOYMENT_TAG, RUNTIME_TAG].freeze
 
-    # Default constructor may be overwritten by child class
-    def initialize
-      @all_result_messages = []
-    end
-
     def result
     end
 
     # Internally Kapnismology is calling this method. We are handling exceptions under the hood here
     def __result__
-      result_object = result || Result.new(false, {}, 'This test has not returned any result.')
-      unless result_object.class.ancestors.include?(Kapnismology::BaseResult)
+      execution = Timeout::timeout(self.class.timeout) { result }
+      result_object = execution || Result.new(false, {}, 'This test has not returned any result')
+      unless result_object.class.ancestors.include?(BaseResult)
         message = "Smoke test #{self.class}, returned #{result_object.class} instead of a Result"
         result_object = Result.new(false, { returned_class: result_object.class }, message)
       end
     rescue Kapnismology::SmokeTestFailed => e
       result_object = e.result
-    rescue SmokeTestFailed => e
-      result_object = e.result
-    rescue => e
+    rescue Timeout::Error => e
+      message = "#{self.class} took more than #{self.class.timeout} seconds to finish and timed-out"
+      result_object = Result.new(false, { exception: e.class, message: e.message }, message)
+    rescue Exception => e # Socket, IO errors inherit from Exception, not StandardError
       message = "Unrescued error happened in #{self.class}"
       result_object = Result.new(false, { exception: e.class, message: e.message }, message)
     ensure
@@ -46,6 +43,10 @@ module Kapnismology
       def tags
         DEFAULT_TAGS
       end
+
+      def timeout
+        10
+      end
     end
 
     protected

data/lib/kapnismology/version.rb

@@ -1,3 +1,3 @@
 module Kapnismology
-  VERSION = '1.11.0'.freeze
+  VERSION = '1.12.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapnismology
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Jordi Polo Carres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -42,16 +42,16 @@ dependencies:
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement