Skip to content

Commit

Permalink
fix trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
jhoblitt committed Nov 24, 2015
1 parent 4808708 commit 5c0628b
Show file tree
Hide file tree
Showing 12 changed files with 7 additions and 18 deletions.
4 changes: 2 additions & 2 deletions spec/unit/classes/params_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
11 changes: 5 additions & 6 deletions spec/unit/facts/megaraid_adapters_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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')))
Expand All @@ -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')))
Expand All @@ -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

1 change: 0 additions & 1 deletion spec/unit/facts/megaraid_fw_package_build_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@
end

end

1 change: 0 additions & 1 deletion spec/unit/facts/megaraid_fw_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@
end

end

1 change: 0 additions & 1 deletion spec/unit/facts/megaraid_physical_drives_sas_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,3 @@
end
end # not on linux
end

1 change: 0 additions & 1 deletion spec/unit/facts/megaraid_physical_drives_sata_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,3 @@
end
end # not on linux
end

1 change: 0 additions & 1 deletion spec/unit/facts/megaraid_physical_drives_size_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,3 @@
end
end # not on linux
end

1 change: 0 additions & 1 deletion spec/unit/facts/megaraid_physical_drives_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,3 @@
end
end # not on linux
end

1 change: 0 additions & 1 deletion spec/unit/facts/megaraid_product_name_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@
end

end

1 change: 0 additions & 1 deletion spec/unit/facts/megaraid_serial_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,3 @@
end

end

1 change: 0 additions & 1 deletion spec/unit/facts/smartd_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@
end
end
end

1 change: 0 additions & 1 deletion spec/unit/facts/smartmontools_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@
end

end

0 comments on commit 5c0628b

Please sign in to comment.