Put timeout logic on the integration tests

Author: kpaulisse

spec/octocatalog-diff/integration/integration_helper.rb

@@ -125,10 +125,14 @@ def self.integration(options = {})
         $stdout = stdout_strio
 
         # Run the OctocatalogDiff::Cli.cli and validate output format.
-        result = begin
-          timeout(120, Timeout::Error) { OctocatalogDiff::Cli.cli(argv, logger, options) }
-        rescue Timeout::Error => e
-          OpenStruct.new(exitcode: 255, exception: e, diffs: [], to: nil, from: nil)
+        result = nil
+        3.times do
+          begin
+            result = timeout(120, Timeout::Error) { OctocatalogDiff::Cli.cli(argv, logger, options) }
+          rescue Timeout::Error => e
+            warn "Warning: #{e.class} #{e.message}"
+          end
+          break if result
         end
 
         if result.is_a?(Integer)

spec/octocatalog-diff/tests/spec_helper.rb

@@ -32,23 +32,6 @@
   config.display_try_failure_messages = true
 end
 
-# We should not have any individual tests that take more than 10 seconds, so
-# set the timeout here to reap any that get stuck. Hopefully this will prevent
-# jobs from intermittently timing out on travis CI.
-# Inspired by https://github.com/basho/innertube/blob/master/spec/support/timeout.rb
-RSpec.configure do |config|
-  config.around(:each) do |example|
-    time = example.metadata[:timeout] || 10
-    begin
-      timeout(time, Timeout::Error) do
-        example.run
-      end
-    rescue Timeout::Error => e
-      example.send :set_exception, e
-    end
-  end
-end
-
 module OctocatalogDiff
   class Spec
     # Set up a logger that is usable across parent and child forks.