Revert "Exclude running libarchive tests on platforms where loading libarchive is broken"

This reverts commit 21a0f21a3231139ca4ca18f7bf4f0fd6f6bcd172.

4 files changed, 4 insertions, 22 deletions

diff --git a/spec/functional/resource/archive_file_spec.rb b/spec/functional/resource/archive_file_spec.rb
index 27815cb319..1289bc0fad 100644
--- a/spec/functional/resource/archive_file_spec.rb
+++ b/spec/functional/resource/archive_file_spec.rb
@@ -18,8 +18,7 @@
 require "spec_helper"
 require "tmpdir"
 
-# Exclude this test on platforms where ffi-libarchive loading is broken
-describe Chef::Resource::ArchiveFile, :libarchive_loading_broken do
+describe Chef::Resource::ArchiveFile do
   include RecipeDSLHelper
 
   let(:tmp_path) { Dir.mktmpdir }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 60b608e4ff..afcaf955c5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -187,8 +187,6 @@ RSpec.configure do |config|
   config.filter_run_excluding not_rhel7: true if rhel7?
   config.filter_run_excluding not_intel_64bit: true if intel_64bit?
 
-  config.filter_run_excluding libarchive_loading_broken: true if aix? || amazon_linux? || rhel7?
-
   # these let us use chef: ">= 13" or ruby: "~> 2.0.0" or any other Gem::Dependency-style constraint
   config.filter_run_excluding chef: DependencyProc.with(Chef::VERSION)
   config.filter_run_excluding ruby: DependencyProc.with(RUBY_VERSION)
diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb
index 1538a4eb34..a3fb95e069 100644
--- a/spec/support/platform_helpers.rb
+++ b/spec/support/platform_helpers.rb
@@ -163,10 +163,6 @@ def aix?
   RUBY_PLATFORM.include?("aix")
 end
 
-def amazon_linux?
-  ohai[:platform_family] == "amazon"
-end
-
 def wpar?
   !((ohai[:virtualization] || {})[:wpar_no].nil?)
 end
diff --git a/spec/unit/resource/archive_file_spec.rb b/spec/unit/resource/archive_file_spec.rb
index 88cbe94629..67fb3dc635 100644
--- a/spec/unit/resource/archive_file_spec.rb
+++ b/spec/unit/resource/archive_file_spec.rb
@@ -16,21 +16,10 @@
 #
 
 require "spec_helper"
+require "ffi-libarchive"
 
-begin
-  require "ffi-libarchive"
-rescue LoadError
-  module Archive
-    class Reader
-      def close; end
-      def each_entry; end
-      def extract(entry, flags = 0, destination: nil); end
-    end
-  end
-end
-
-# Exclude this test on platforms where ffi-libarchive loading is broken
-describe Chef::Resource::ArchiveFile, :libarchive_loading_broken do
+# Excluding this test on Windows until CI issues can be addressed.
+describe Chef::Resource::ArchiveFile do
   let(:node) { Chef::Node.new }
   let(:events) { Chef::EventDispatch::Dispatcher.new }
   let(:run_context) { Chef::RunContext.new(node, {}, events) }