diff options
| author | Scott Hain <shain@getchef.com> | 2014-10-28 09:27:24 -0700 |
|---|---|---|
| committer | Scott Hain <shain@getchef.com> | 2014-10-28 09:27:24 -0700 |
| commit | 4b1ae3f740ee1a764e1d75b5fbef974ad319a887 (patch) | |
| tree | dd110f92f4c389a70eb6576eeba91d786e77070b | |
| parent | cb978d59239e7fcfea48749334185caa7064b9ea (diff) | |
| parent | 0dd4132d0e1ca5d805cebc3756391b4dc5eda837 (diff) | |
| download | chef-4b1ae3f740ee1a764e1d75b5fbef974ad319a887.tar.gz | |
Merge pull request #2309 from ClogenyTechnologies/kd-aix-fixes-28oct
Fix test failures with latest AIX build.
| -rw-r--r-- | lib/chef/provider/service/aix.rb | 2 | ||||
| -rw-r--r-- | spec/functional/resource/base.rb | 1 | ||||
| -rw-r--r-- | spec/functional/resource/cron_spec.rb | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/lib/chef/provider/service/aix.rb b/lib/chef/provider/service/aix.rb index 6f70f797b9..0aef62c62e 100644 --- a/lib/chef/provider/service/aix.rb +++ b/lib/chef/provider/service/aix.rb @@ -24,6 +24,8 @@ class Chef class Aix < Chef::Provider::Service attr_reader :status_load_success + provides :service, os: "aix" + def initialize(new_resource, run_context) super end diff --git a/spec/functional/resource/base.rb b/spec/functional/resource/base.rb index cdb52fbc1b..10b26f924f 100644 --- a/spec/functional/resource/base.rb +++ b/spec/functional/resource/base.rb @@ -22,6 +22,7 @@ def run_context 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 diff --git a/spec/functional/resource/cron_spec.rb b/spec/functional/resource/cron_spec.rb index 287b5a1391..ed30756583 100644 --- a/spec/functional/resource/cron_spec.rb +++ b/spec/functional/resource/cron_spec.rb @@ -56,8 +56,8 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do let(:new_resource) do new_resource = Chef::Resource::Cron.new("Chef functional test cron", run_context) new_resource.user 'root' - # @hourly is not supported on solaris - if ohai[:platform] == "solaris" || ohai[:platform] == "solaris2" + # @hourly is not supported on solaris, aix + if ohai[:platform] == "solaris" || ohai[:platform] == "solaris2" || ohai[:platform] == "aix" new_resource.minute "0 * * * *" else new_resource.minute '@hourly' |