diff options
author | danielsdeleo <dan@chef.io> | 2015-06-19 15:02:29 -0700 |
---|---|---|
committer | danielsdeleo <dan@chef.io> | 2015-06-19 17:41:51 -0700 |
commit | 599ef6ac28d269c73fed67cac171740b82e75eb3 (patch) | |
tree | bf725bba96edeb96155ea83fbeaf55dbe464df36 | |
parent | cf6e9700516ab874ed714ea58d8068ac87516e54 (diff) | |
download | ohai-599ef6ac28d269c73fed67cac171740b82e75eb3.tar.gz |
Fix RSpec warning for 'potential_false_positives'
-rw-r--r-- | lib/ohai/plugins/cloud_v2.rb | 4 | ||||
-rw-r--r-- | spec/unit/mixin/ec2_metadata_spec.rb | 4 | ||||
-rw-r--r-- | spec/unit/plugins/cloud_v2_spec.rb | 8 | ||||
-rw-r--r-- | spec/unit/runner_spec.rb | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/ohai/plugins/cloud_v2.rb b/lib/ohai/plugins/cloud_v2.rb index 6aceeb93..ceee89a3 100644 --- a/lib/ohai/plugins/cloud_v2.rb +++ b/lib/ohai/plugins/cloud_v2.rb @@ -62,7 +62,7 @@ Ohai.plugin(:CloudV2) do @cloud[:local_ipv4_addrs] ||= Array.new @cloud[:local_ipv4_addrs] << ipaddr.to_s else - raise "ERROR: in valid accessibility param of '#{accessibility}'. must be :public or :private." + raise "ERROR: invalid accessibility param of '#{accessibility}'. must be :public or :private." end end @@ -79,7 +79,7 @@ Ohai.plugin(:CloudV2) do @cloud[:local_ipv6_addrs] ||= Array.new @cloud[:local_ipv6_addrs] << ipaddr.to_s else - raise "ERROR: in valid accessibility param of '#{accessibility}'. must be :public or :private." + raise "ERROR: invalid accessibility param of '#{accessibility}'. must be :public or :private." end end diff --git a/spec/unit/mixin/ec2_metadata_spec.rb b/spec/unit/mixin/ec2_metadata_spec.rb index 58527258..02e1cca9 100644 --- a/spec/unit/mixin/ec2_metadata_spec.rb +++ b/spec/unit/mixin/ec2_metadata_spec.rb @@ -49,7 +49,7 @@ describe Ohai::Mixin::Ec2Metadata do let(:response) { double("Net::HTTP Response", :body => "2020-01-01\nUnsupported", :code => "200") } it "raises an error" do - expect { mixin.best_api_version}.to raise_error + expect { mixin.best_api_version}.to raise_error(RuntimeError) end end @@ -66,7 +66,7 @@ describe Ohai::Mixin::Ec2Metadata do let(:response) { double("Net::HTTP Response", :body => "1.0\n2011-05-01\n2012-01-12\nUnsupported", :code => "418") } it "raises an error" do - expect { mixin.best_api_version}.to raise_error + expect { mixin.best_api_version}.to raise_error(RuntimeError) end end end diff --git a/spec/unit/plugins/cloud_v2_spec.rb b/spec/unit/plugins/cloud_v2_spec.rb index f5fe0de0..d12ee9a7 100644 --- a/spec/unit/plugins/cloud_v2_spec.rb +++ b/spec/unit/plugins/cloud_v2_spec.rb @@ -52,22 +52,22 @@ describe "CloudAttrs object" do it "throws exception with a bad ipv4 address" do @cloud_attr_obj = ::CloudAttrs.new() - expect { @cloud_attr_obj.add_ipv6_addr("somebogusstring", :public) }.to raise_error + expect { @cloud_attr_obj.add_ipv6_addr("somebogusstring", :public) }.to raise_error(RuntimeError) end it "throws exception with a bad ipv6 address" do @cloud_attr_obj = ::CloudAttrs.new() - expect { @cloud_attr_obj.add_ipv6_addr("FEED:B0B:DEAD:BEEF", :public) }.to raise_error + expect { @cloud_attr_obj.add_ipv6_addr("FEED:B0B:DEAD:BEEF", :public) }.to raise_error(RuntimeError) end it "throws exception with ipv6 address passed to ipv4" do @cloud_attr_obj = ::CloudAttrs.new() - expect { @cloud_attr_obj.add_ipv4_addr("3ffe:506:2::1", :public) }.to raise_error + expect { @cloud_attr_obj.add_ipv4_addr("3ffe:506:2::1", :public) }.to raise_error(RuntimeError) end it "throws exception with ipv4 address passed to ipv6" do @cloud_attr_obj = ::CloudAttrs.new() - expect { @cloud_attr_obj.add_ipv6_addr("1.2.3.4", :public) }.to raise_error + expect { @cloud_attr_obj.add_ipv6_addr("1.2.3.4", :public) }.to raise_error(RuntimeError) end diff --git a/spec/unit/runner_spec.rb b/spec/unit/runner_spec.rb index 6c04650c..2efc244d 100644 --- a/spec/unit/runner_spec.rb +++ b/spec/unit/runner_spec.rb @@ -141,7 +141,7 @@ describe Ohai::Runner, "run_plugin" do end it "should not run the plugin" do - expect{ @runner.run_plugin(@plugin) }.to raise_error + expect{ @runner.run_plugin(@plugin) }.to raise_error(Ohai::Exceptions::AttributeNotFound) expect(@plugin.has_run?).to be false end end |