Merge pull request #668 from m3t30r/master

Set collectd_version fact to nil rather than empty string when not present
voxpupuli · Sep 15, 2017 · 0ce348d · 0ce348d
2 parents 2c85898 + 200fd79
commit 0ce348d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/facter/collectd_version.rb b/lib/facter/collectd_version.rb
@@ -11,8 +11,6 @@
     if Facter::Util::Resolution.which('collectd')
       collectd_help = Facter::Util::Resolution.exec('collectd -h')
       %r{^collectd ([\w\.]+), http://collectd\.org/}.match(collectd_help)[1]
-    else
-      ''
     end
   end
 end
diff --git a/spec/unit/collectd_real_version_spec.rb b/spec/unit/collectd_real_version_spec.rb
@@ -18,8 +18,8 @@
     expect(Facter.fact(:collectd_version).value).to eq('5.1.0.git')
   end
 
-  it 'is empty string if collectd not installed' do
+  it 'is not defined if collectd not installed' do
     Facter::Util::Resolution.stubs(:which).with('collectd').returns(nil)
-    expect(Facter.fact(:collectd_version).value).to eq('')
+    expect(Facter.fact(:collectd_version).value).to be_nil
   end
 end