summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Higgins <pete@peterhiggins.org>2020-06-30 13:35:44 -0700
committerPete Higgins <pete@peterhiggins.org>2020-06-30 13:35:44 -0700
commitd5f6f582eb6244ce3f9a6bed108680e746c7a873 (patch)
tree9a7641b51f30346cbbaec3ab0ee5d76235d2ff88
parent73161d66c97459b8a97b8d7e3f21518102ef4381 (diff)
downloadchef-fix-release-build-tests.tar.gz
Use the original run_context for tests that depend on platform specific stuff.fix-release-build-tests
Signed-off-by: Pete Higgins <pete@peterhiggins.org>
-rw-r--r--spec/functional/resource/cron_spec.rb10
-rw-r--r--spec/functional/resource/ifconfig_spec.rb10
-rw-r--r--spec/functional/resource/mount_spec.rb11
3 files changed, 28 insertions, 3 deletions
diff --git a/spec/functional/resource/cron_spec.rb b/spec/functional/resource/cron_spec.rb
index 932bef4a42..131fa89ba5 100644
--- a/spec/functional/resource/cron_spec.rb
+++ b/spec/functional/resource/cron_spec.rb
@@ -52,6 +52,16 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
end
# Actual tests
+
+ let(:run_context) do
+ node = Chef::Node.new
+ node.default[:platform] = ohai[:platform]
+ node.default[:platform_version] = ohai[:platform_version]
+ node.default[:os] = ohai[:os]
+ events = Chef::EventDispatch::Dispatcher.new
+ Chef::RunContext.new(node, {}, events)
+ end
+
let(:new_resource) do
run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
diff --git a/spec/functional/resource/ifconfig_spec.rb b/spec/functional/resource/ifconfig_spec.rb
index 70ae0f0703..127e4e6331 100644
--- a/spec/functional/resource/ifconfig_spec.rb
+++ b/spec/functional/resource/ifconfig_spec.rb
@@ -25,8 +25,16 @@ include_flag = !(%w{amazon debian aix}.include?(ohai[:platform_family]) || (ohai
describe Chef::Resource::Ifconfig, :requires_root, :requires_ifconfig, external: include_flag do
include Chef::Mixin::ShellOut
+ let(:run_context) do
+ node = Chef::Node.new
+ node.default[:platform] = ohai[:platform]
+ node.default[:platform_version] = ohai[:platform_version]
+ node.default[:os] = ohai[:os]
+ events = Chef::EventDispatch::Dispatcher.new
+ Chef::RunContext.new(node, {}, events)
+ end
+
let(:new_resource) do
- run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
new_resource = Chef::Resource::Ifconfig.new("10.10.0.1", run_context)
new_resource
end
diff --git a/spec/functional/resource/mount_spec.rb b/spec/functional/resource/mount_spec.rb
index 2b8a11a339..55738a4326 100644
--- a/spec/functional/resource/mount_spec.rb
+++ b/spec/functional/resource/mount_spec.rb
@@ -100,9 +100,16 @@ describe Chef::Resource::Mount, :requires_root, external: include_flag do
expect(shell_out("cat #{unix_mount_config_file}").stdout).not_to include("#{mount_point}:")
end
- let(:new_resource) do
- run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+ let(:run_context) do
+ node = Chef::Node.new
+ node.default[:platform] = ohai[:platform]
+ node.default[:platform_version] = ohai[:platform_version]
+ node.default[:os] = ohai[:os]
+ events = Chef::EventDispatch::Dispatcher.new
+ Chef::RunContext.new(node, {}, events)
+ end
+ let(:new_resource) do
new_resource = Chef::Resource::Mount.new(@mount_point, run_context)
new_resource.device @device
new_resource.name @mount_point