On Jan 17, 2010, at 9:03 AM, Paul Nasrat wrote:
This adds a test to ensure we are not prematurely splitting on Handle
Signed-off-by: Paul Nasrat <[email protected]>
---
lib/facter/util/manufacturer.rb | 2 +-
spec/unit/util/manufacturer.rb | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/
manufacturer.rb
index d015226..baf24bc 100644
--- a/lib/facter/util/manufacturer.rb
+++ b/lib/facter/util/manufacturer.rb
@@ -28,7 +28,7 @@ module Facter::Manufacturer
end
def self.dmi_find_system_info(name)
- splitstr= Facter.value(:kernel) == 'SunOS' ? "ID SIZE
TYPE" : "Handle"
+ splitstr= Facter.value(:kernel) == 'SunOS' ? "ID SIZE
TYPE" : "/^Handle/"
There's probably just not enough context in this patch, but is that
really a quoted regex?
output = self.get_dmi_table()
return if output.nil?
name.each_pair do |key,v|
diff --git a/spec/unit/util/manufacturer.rb b/spec/unit/util/
manufacturer.rb
index 47a0c98..11d207d 100644
--- a/spec/unit/util/manufacturer.rb
+++ b/spec/unit/util/manufacturer.rb
@@ -23,4 +23,26 @@ describe Facter::Manufacturer do
Facter::Manufacturer.dmi_find_system_info(query)
Facter.value(:productname).should == "MS-6754"
end
+
+ it "should not split on dmi keys containing the string Handle" do
+ dmidecode_output = <<-eos
+Handle 0x1000, DMI type 16, 15 bytes
+Physical Memory Array
+ Location: System Board Or Motherboard
+ Use: System Memory
+ Error Correction Type: None
+ Maximum Capacity: 4 GB
+ Error Information Handle: Not Provided
+ Number Of Devices: 2
+
+Handle 0x001F
+ DMI type 127, 4 bytes.
+ End Of Table
+ eos
+
Facter::Manufacturer.expects(:get_dmi_table).returns(dmidecode_output)
+ Facter.fact(:kernel).stubs(:value).returns("Linux")
+ query = { 'Physical Memory Array' => [ { 'Number Of
Devices:' => 'ramslots'}]}
+ Facter::Manufacturer.dmi_find_system_info(query)
+ Facter.value(:ramslots).should == "2"
+ end
end
\ No newline at end of file
--
1.6.4.2
--
You received this message because you are subscribed to the Google
Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected]
.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en
.
--
I wanna hang a map of the world in my house. Then I'm gonna put pins
into all the locations that I've traveled to. But first, I'm gonna
have to travel to the top two corners of the map so it won't fall
down. -- Mitch Hedberg
---------------------------------------------------------------------
Luke Kanies -|- http://reductivelabs.com -|- +1(615)594-8199
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
