diff options
author | Claire McQuin <claire@getchef.com> | 2015-10-09 09:02:09 -0700 |
---|---|---|
committer | Claire McQuin <claire@getchef.com> | 2015-10-09 09:09:21 -0700 |
commit | 64ae29d400d23ab31db66e92318ff8eb01faf38d (patch) | |
tree | 6f75ef8364ecde4d7263ff3d8417bd946e7460a6 | |
parent | 8f65feb6e69631db95875204510398b4680e557d (diff) | |
download | ohai-64ae29d400d23ab31db66e92318ff8eb01faf38d.tar.gz |
Support String values.mcquin/ohai-629
-rw-r--r-- | lib/ohai/plugins/solaris2/filesystem.rb | 2 | ||||
-rw-r--r-- | spec/unit/plugins/solaris2/filesystem.rb | 36 |
2 files changed, 27 insertions, 11 deletions
diff --git a/lib/ohai/plugins/solaris2/filesystem.rb b/lib/ohai/plugins/solaris2/filesystem.rb index 20ffc303..4b8042fc 100644 --- a/lib/ohai/plugins/solaris2/filesystem.rb +++ b/lib/ohai/plugins/solaris2/filesystem.rb @@ -69,7 +69,7 @@ Ohai.plugin(:Filesystem) do if configuration(:zfs_properties).nil? || configuration(:zfs_properties).empty? zfs_get << "all" else - zfs_get << configuration(:zfs_properties).join(',') + zfs_get << [configuration(:zfs_properties)].join(',') end so = shell_out(zfs_get) so.stdout.lines do |line| diff --git a/spec/unit/plugins/solaris2/filesystem.rb b/spec/unit/plugins/solaris2/filesystem.rb index 9455d6bf..e0ff7b8a 100644 --- a/spec/unit/plugins/solaris2/filesystem.rb +++ b/spec/unit/plugins/solaris2/filesystem.rb @@ -49,19 +49,35 @@ describe Ohai::System, "Solaris2.X filesystem plugin" do end context "when 'zfs get' properties are configured" do - let(:plugin_config) do - { - :filesystem => { - :zfs_properties => ['mountpoint', 'creation', 'available', 'used'] + shared_examples_for "configured zfs properties" do + let(:plugin_config) do + { + :filesystem => { + :zfs_properties => zfs_properties + } } - } + end + + it "collects configured filesystem properties" do + expect(plugin).to receive(:shell_out). + with("zfs get -p -H #{expected_cmd}"). + and_return(mock_shell_out(0, "", "")) + plugin.run + end end - it "collects configured filesystem properties" do - expect(plugin).to receive(:shell_out). - with("zfs get -p -H mountpoint,creation,available,used"). - and_return(mock_shell_out(0, "", "")) - plugin.run + context "as a String" do + include_examples "configured zfs properties" do + let(:zfs_properties) { 'mountpoint,creation,available,used' } + let(:expected_cmd) { 'mountpoint,creation,available,used' } + end + end + + context "as an Array" do + include_examples "configured zfs properties" do + let(:zfs_properties) { ['mountpoint', 'creation', 'available', 'used'] } + let(:expected_cmd) { 'mountpoint,creation,available,used' } + end end end end |