summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2014-08-28 16:53:17 -0400
committerBryan McLellan <btm@loftninjas.org>2014-08-28 16:53:17 -0400
commit1636a22a14070a71e43d387c6bad4334459eacc4 (patch)
treefcc4c2dcd2a0f21f9be1c4c71044371c22436af5
parent6c94d324e476c8ef4595078012d7758efb708f66 (diff)
downloadohai-1636a22a14070a71e43d387c6bad4334459eacc4.tar.gz
Ignore passwd plugin on Windows
The Etc module returns nil on Windows for everything useful.
-rw-r--r--lib/ohai/plugins/passwd.rb4
-rw-r--r--spec/unit/plugins/passwd_spec.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/ohai/plugins/passwd.rb b/lib/ohai/plugins/passwd.rb
index 9a5cd06f..675a70b8 100644
--- a/lib/ohai/plugins/passwd.rb
+++ b/lib/ohai/plugins/passwd.rb
@@ -35,4 +35,8 @@ Ohai.plugin(:Passwd) do
current_user fix_encoding(Etc.getpwuid(Process.euid).name)
end
end
+
+ collect_data(:windows) do
+ # Etc returns nil on Windows
+ end
end
diff --git a/spec/unit/plugins/passwd_spec.rb b/spec/unit/plugins/passwd_spec.rb
index 335ba6b7..0fef63de 100644
--- a/spec/unit/plugins/passwd_spec.rb
+++ b/spec/unit/plugins/passwd_spec.rb
@@ -1,6 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
-describe Ohai::System, "plugin etc" do
+describe Ohai::System, "plugin etc", :unix_only do
before(:each) do
@plugin = get_plugin("passwd")
end