Skip to content

Add check to ensure regex does not throw for none type. #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hunner merged 1 commit into from
Oct 15, 2015
Merged

Add check to ensure regex does not throw for none type. #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/facter/pe_version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@
#
Facter.add("pe_version") do
setcode do
pe_ver = Facter.value("puppetversion").match(/Puppet Enterprise (\d+\.\d+\.\d+)/)
pe_ver[1] if pe_ver
puppet_ver = Facter.value("puppetversion")
if puppet_ver != nil
pe_ver = puppet_ver.match(/Puppet Enterprise (\d+\.\d+\.\d+)/)
pe_ver[1] if pe_ver
else
nil
end
end
end

Expand Down
12 changes: 12 additions & 0 deletions spec/unit/facter/pe_version_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@
Facter.collection.loader.load(:pe_version)
end
end

context "When puppetversion is nil" do
before :each do
Facter.fact(:puppetversion).stubs(:value).returns(nil)
end

it "pe_version is nil" do
expect(Facter.fact(:puppetversion).value).to be_nil
expect(Facter.fact(:pe_version).value).to be_nil
end
end

context "If PE is installed" do
%w{ 2.6.1 2.10.300 }.each do |version|
Expand Down Expand Up @@ -73,4 +84,5 @@
expect(Facter.fact(:pe_patch_version).value).to be_nil
end
end

end
⚡