Merge branch 'kpaulisse-ignore-kill-failures' into kpaulisse-file-compare-environments-production

Author: Kevin Paulisse

spec/octocatalog-diff/integration/integration_helper.rb

@@ -12,9 +12,13 @@ class Integration
     def self.integration_with_puppetdb(server_opts, opts)
       server_opts[:rsa_key] ||= File.read(OctocatalogDiff::Spec.fixture_path('ssl/generated/server.key'))
       server_opts[:cert] ||= File.read(OctocatalogDiff::Spec.fixture_path('ssl/generated/server.crt'))
-      test_server = SSLTestServer.new(server_opts)
-      test_server.start
-      raise 'Unable to instantiate SSLTestServer' unless test_server.port > 0
+      test_server = nil
+      3.times do
+        test_server = SSLTestServer.new(server_opts)
+        test_server.start
+        break if test_server.port > 0
+      end
+      raise OctocatalogDiff::Spec::FixtureError, 'Unable to instantiate SSLTestServer' unless test_server.port > 0
       puppetdb_url_save = ENV['PUPPETDB_URL']
       ENV['PUPPETDB_URL'] = "https://localhost:#{test_server.port}"
       integration(opts)

spec/octocatalog-diff/integration/pe_enc_spec.rb

@@ -11,9 +11,13 @@ def initialize(options = {})
         server_opts = options.dup
         server_opts[:rsa_key] ||= File.read(OctocatalogDiff::Spec.fixture_path('ssl/generated/server.key'))
         server_opts[:cert] ||= File.read(OctocatalogDiff::Spec.fixture_path('ssl/generated/server.crt'))
-        @test_server = SSLTestServer.new(server_opts)
-        @test_server.start
-        raise 'Unable to instantiate SSLTestServer' unless @test_server.port > 0
+        @test_server = nil
+        3.times do
+          @test_server = SSLTestServer.new(server_opts)
+          @test_server.start
+          break if @test_server.port > 0
+        end
+        raise OctocatalogDiff::Spec::FixtureError, 'Unable to instantiate SSLTestServer' unless @test_server.port > 0
       end
 
       def stop

spec/octocatalog-diff/integration/puppetmaster_spec.rb

@@ -9,9 +9,13 @@ def initialize(options = {})
         server_opts = options.dup
         server_opts[:rsa_key] ||= File.read(OctocatalogDiff::Spec.fixture_path('ssl/generated/server.key'))
         server_opts[:cert] ||= File.read(OctocatalogDiff::Spec.fixture_path('ssl/generated/server.crt'))
-        @test_server = SSLTestServer.new(server_opts)
-        @test_server.start
-        raise 'Unable to instantiate SSLTestServer' unless @test_server.port > 0
+        @test_server = nil
+        3.times do
+          @test_server = SSLTestServer.new(server_opts)
+          @test_server.start
+          break if @test_server.port > 0
+        end
+        raise OctocatalogDiff::Spec::FixtureError, 'Unable to instantiate SSLTestServer' unless @test_server.port > 0
       end
 
       def stop

spec/octocatalog-diff/tests/puppetdb_spec.rb

@@ -9,9 +9,13 @@
 def ssl_test(server_opts, opts = {})
   server_opts[:rsa_key] ||= File.read(OctocatalogDiff::Spec.fixture_path('ssl/generated/server.key'))
   server_opts[:cert] ||= File.read(OctocatalogDiff::Spec.fixture_path('ssl/generated/server.crt'))
-  test_server = SSLTestServer.new(server_opts)
-  test_server.start
-  raise 'Unable to instantiate SSLTestServer' unless test_server.port > 0
+  test_server = nil
+  3.times do
+    test_server = SSLTestServer.new(server_opts)
+    test_server.start
+    break if test_server.port > 0
+  end
+  raise OctocatalogDiff::Spec::FixtureError, 'Unable to instantiate SSLTestServer' unless test_server.port > 0
   testobj = OctocatalogDiff::PuppetDB.new(opts.merge(puppetdb_url: "https://localhost:#{test_server.port}"))
   return testobj.get('/foo')
 ensure

spec/octocatalog-diff/tests/spec_helper.rb

@@ -37,6 +37,9 @@ class Spec
     PUPPET_BINARY = File.expand_path('../../../script/puppet', File.dirname(__FILE__)).freeze
     raise "Puppet binary (#{PUPPET_BINARY}) is missing" unless File.file?(PUPPET_BINARY)
 
+    # An error to raise if a fixture fails but code doesn't
+    class FixtureError; end
+
     # One 'require' to rule them all. Find the code relative to the directory
     # of this spec file, so we can easily update this to reflect packaging changes.
     def self.require_path(path)