diff --git a/spec/unit/classes/params_spec.rb b/spec/unit/classes/params_spec.rb index 0da9dfc..0eaee52 100644 --- a/spec/unit/classes/params_spec.rb +++ b/spec/unit/classes/params_spec.rb @@ -21,13 +21,13 @@ end describe 'unsupported osfamily' do - let :facts do + let :facts do { :osfamily => 'Solaris', :operatingsystem => 'Solaris', } end - + it 'should fail' do expect { should contain_class('smartd::params') }. to raise_error(Puppet::Error, /not supported on Solaris/) diff --git a/spec/unit/facts/megaraid_adapters_spec.rb b/spec/unit/facts/megaraid_adapters_spec.rb index ded8ec6..58366b6 100644 --- a/spec/unit/facts/megaraid_adapters_spec.rb +++ b/spec/unit/facts/megaraid_adapters_spec.rb @@ -6,7 +6,7 @@ context 'on linux' do context 'megacli not in path' do it do - Facter.fact(:kernel).stubs(:value).returns('Linux') + Facter.fact(:kernel).stubs(:value).returns('Linux') Facter.fact(:megacli).stubs(:value).returns(nil) Facter.fact(:megaraid_adapters).value.should be_nil @@ -15,7 +15,7 @@ context 'megacli is broken' do it do - Facter.fact(:kernel).stubs(:value).returns('Linux') + Facter.fact(:kernel).stubs(:value).returns('Linux') Facter.fact(:megacli).stubs(:value).returns('/usr/bin/MegaCli') Facter::Util::Resolution.stubs(:exec).with('/usr/bin/MegaCli -adpCount -NoLog 2>&1'). returns(nil) @@ -26,7 +26,7 @@ context 'megacli is working' do it 'should find 0 adapters' do - Facter.fact(:kernel).stubs(:value).returns('Linux') + Facter.fact(:kernel).stubs(:value).returns('Linux') Facter::Util::Resolution.stubs(:which).with('MegaCli').returns('/usr/bin/MegaCli') Facter::Util::Resolution.stubs(:exec).with('/usr/bin/MegaCli -adpCount -NoLog 2>&1'). returns(File.read(fixtures('megacli', 'adpcount-count_0'))) @@ -35,7 +35,7 @@ end it 'should find 1 adapters' do - Facter.fact(:kernel).stubs(:value).returns('Linux') + Facter.fact(:kernel).stubs(:value).returns('Linux') Facter::Util::Resolution.stubs(:which).with('MegaCli').returns('/usr/bin/MegaCli') Facter::Util::Resolution.stubs(:exec).with('/usr/bin/MegaCli -adpCount -NoLog 2>&1'). returns(File.read(fixtures('megacli', 'adpcount-count_1'))) @@ -47,11 +47,10 @@ context 'not on linux' do it do - Facter.fact(:kernel).stubs(:value).returns('Solaris') + Facter.fact(:kernel).stubs(:value).returns('Solaris') Facter.fact(:megaraid_adapters).value.should be_nil end end # not on linux end - diff --git a/spec/unit/facts/megaraid_fw_package_build_spec.rb b/spec/unit/facts/megaraid_fw_package_build_spec.rb index 713e44c..78a2c20 100644 --- a/spec/unit/facts/megaraid_fw_package_build_spec.rb +++ b/spec/unit/facts/megaraid_fw_package_build_spec.rb @@ -42,4 +42,3 @@ end end - diff --git a/spec/unit/facts/megaraid_fw_version_spec.rb b/spec/unit/facts/megaraid_fw_version_spec.rb index b2a66c8..a492638 100644 --- a/spec/unit/facts/megaraid_fw_version_spec.rb +++ b/spec/unit/facts/megaraid_fw_version_spec.rb @@ -42,4 +42,3 @@ end end - diff --git a/spec/unit/facts/megaraid_physical_drives_sas_spec.rb b/spec/unit/facts/megaraid_physical_drives_sas_spec.rb index d4e6354..4e8783f 100644 --- a/spec/unit/facts/megaraid_physical_drives_sas_spec.rb +++ b/spec/unit/facts/megaraid_physical_drives_sas_spec.rb @@ -64,4 +64,3 @@ end end # not on linux end - diff --git a/spec/unit/facts/megaraid_physical_drives_sata_spec.rb b/spec/unit/facts/megaraid_physical_drives_sata_spec.rb index 74a6813..6a3b01a 100644 --- a/spec/unit/facts/megaraid_physical_drives_sata_spec.rb +++ b/spec/unit/facts/megaraid_physical_drives_sata_spec.rb @@ -64,4 +64,3 @@ end end # not on linux end - diff --git a/spec/unit/facts/megaraid_physical_drives_size_spec.rb b/spec/unit/facts/megaraid_physical_drives_size_spec.rb index cbff103..f60f513 100644 --- a/spec/unit/facts/megaraid_physical_drives_size_spec.rb +++ b/spec/unit/facts/megaraid_physical_drives_size_spec.rb @@ -75,4 +75,3 @@ end end # not on linux end - diff --git a/spec/unit/facts/megaraid_physical_drives_spec.rb b/spec/unit/facts/megaraid_physical_drives_spec.rb index 8fb715a..f7ea41b 100644 --- a/spec/unit/facts/megaraid_physical_drives_spec.rb +++ b/spec/unit/facts/megaraid_physical_drives_spec.rb @@ -64,4 +64,3 @@ end end # not on linux end - diff --git a/spec/unit/facts/megaraid_product_name_spec.rb b/spec/unit/facts/megaraid_product_name_spec.rb index 02a1839..5b71749 100644 --- a/spec/unit/facts/megaraid_product_name_spec.rb +++ b/spec/unit/facts/megaraid_product_name_spec.rb @@ -42,4 +42,3 @@ end end - diff --git a/spec/unit/facts/megaraid_serial_spec.rb b/spec/unit/facts/megaraid_serial_spec.rb index c8664a1..eff1b72 100644 --- a/spec/unit/facts/megaraid_serial_spec.rb +++ b/spec/unit/facts/megaraid_serial_spec.rb @@ -65,4 +65,3 @@ end end - diff --git a/spec/unit/facts/smartd_spec.rb b/spec/unit/facts/smartd_spec.rb index 1583063..3b2ce4f 100644 --- a/spec/unit/facts/smartd_spec.rb +++ b/spec/unit/facts/smartd_spec.rb @@ -17,4 +17,3 @@ end end end - diff --git a/spec/unit/facts/smartmontools_version_spec.rb b/spec/unit/facts/smartmontools_version_spec.rb index fbbf728..8f7b06d 100644 --- a/spec/unit/facts/smartmontools_version_spec.rb +++ b/spec/unit/facts/smartmontools_version_spec.rb @@ -36,4 +36,3 @@ end end -