summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Barnett <jason.w.barnett@gmail.com>2021-09-21 15:50:22 -0600
committerJason Barnett <jason.w.barnett@gmail.com>2021-09-21 15:52:44 -0600
commit2cd4f286f5b5f0d5e5641a7329e07d461539e5be (patch)
tree4cc809e89b306e76a553120c5f2e03f3bbf7dbf5
parent873f46788f2a10ce870fffad5546b6c55df43534 (diff)
downloadchef-2cd4f286f5b5f0d5e5641a7329e07d461539e5be.tar.gz
Re-enable archive_file tests on Windows
-rw-r--r--spec/functional/resource/archive_file_spec.rb3
-rw-r--r--spec/unit/resource/archive_file_spec.rb15
2 files changed, 3 insertions, 15 deletions
diff --git a/spec/functional/resource/archive_file_spec.rb b/spec/functional/resource/archive_file_spec.rb
index 11ef5fa5fc..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"
-# Excluding this test on Windows until CI issues can be addressed.
-describe Chef::Resource::ArchiveFile, :not_supported_on_windows do
+describe Chef::Resource::ArchiveFile do
include RecipeDSLHelper
let(:tmp_path) { Dir.mktmpdir }
diff --git a/spec/unit/resource/archive_file_spec.rb b/spec/unit/resource/archive_file_spec.rb
index 63096cb6ee..8fbd4a8ce1 100644
--- a/spec/unit/resource/archive_file_spec.rb
+++ b/spec/unit/resource/archive_file_spec.rb
@@ -16,21 +16,10 @@
#
require "spec_helper"
-
-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
+require 'ffi-libarchive'
# Excluding this test on Windows until CI issues can be addressed.
-describe Chef::Resource::ArchiveFile, :not_supported_on_windows do
+describe Chef::Resource::ArchiveFile do
let(:node) { Chef::Node.new }
let(:events) { Chef::EventDispatch::Dispatcher.new }
let(:run_context) { Chef::RunContext.new(node, {}, events) }