summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-01-23 12:56:02 -0800
committerTim Smith <tsmith@chef.io>2019-01-23 12:56:02 -0800
commit712b7055251464b2531776b6e12e99b6c176bc2e (patch)
treeb00190184ab91dd91e0185e589235161e1d4b879
parent2d9aaaa000e3973435e715d5ff45309a0674b50d (diff)
downloadchef-712b7055251464b2531776b6e12e99b6c176bc2e.tar.gz
Remove bogus "solaris" platform from specs
We have a solaris2 platform, but not a solaris platform. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--spec/functional/resource/cron_spec.rb6
-rw-r--r--spec/unit/provider_resolver_spec.rb9
2 files changed, 3 insertions, 12 deletions
diff --git a/spec/functional/resource/cron_spec.rb b/spec/functional/resource/cron_spec.rb
index 84fe304585..f616b84ce9 100644
--- a/spec/functional/resource/cron_spec.rb
+++ b/spec/functional/resource/cron_spec.rb
@@ -28,7 +28,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
# Platform specific validation routines.
def cron_should_exists(cron_name, command)
case ohai[:platform]
- when "aix", "solaris", "opensolaris", "solaris2", "omnios"
+ when "aix", "opensolaris", "solaris2", "omnios"
expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").exitstatus).to eq(0)
expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").stdout.lines.to_a.size).to eq(1)
expect(shell_out("crontab -l #{new_resource.user} | grep \"#{command}\"").exitstatus).to eq(0)
@@ -43,7 +43,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
def cron_should_not_exists(cron_name)
case ohai[:platform]
- when "aix", "solaris", "opensolaris", "solaris2", "omnios"
+ when "aix", "opensolaris", "solaris2", "omnios"
expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").exitstatus).to eq(1)
expect(shell_out("crontab -l #{new_resource.user} | grep \"#{new_resource.command}\"").stdout.lines.to_a.size).to eq(0)
else
@@ -57,7 +57,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
new_resource = Chef::Resource::Cron.new("Chef functional test cron", run_context)
new_resource.user "root"
# @hourly is not supported on solaris, aix
- if ohai[:platform] == "solaris" || ohai[:platform] == "solaris2" || ohai[:platform] == "aix"
+ if ohai[:platform] == "solaris2" || ohai[:platform] == "aix"
new_resource.minute "0 * * * *"
else
new_resource.minute "@hourly"
diff --git a/spec/unit/provider_resolver_spec.rb b/spec/unit/provider_resolver_spec.rb
index 9b3839163d..bc7afc5f91 100644
--- a/spec/unit/provider_resolver_spec.rb
+++ b/spec/unit/provider_resolver_spec.rb
@@ -869,15 +869,6 @@ describe Chef::ProviderResolver do
},
- "solaris" => {
- "solaris" => {
- "solaris" => {
- "3.1.4" => {
- },
- },
- },
- },
-
"exherbo" => {
"exherbo" => {
"exherbo" => {