summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2016-04-13 09:09:02 -0700
committerTim Smith <tsmith84@gmail.com>2016-04-13 09:09:02 -0700
commitae9256a934155bd6ee69f7eea9fce80372e457ac (patch)
treea8a504c346ade9facfbdf57a0539d60eb38e06a0
parent597e51e8466cc50360ad57fa606a7de16d91d49b (diff)
downloadohai-ae9256a934155bd6ee69f7eea9fce80372e457ac.tar.gz
Remove specs for other clouds that don't actually work
Allowing a method to receive ec2 or rackspace doesn't mean we detected this. These are actually duplicates of the "hint file no present" specs we already have. We just think they're doing something different.
-rw-r--r--spec/unit/plugins/digital_ocean_spec.rb22
-rw-r--r--spec/unit/plugins/ec2_spec.rb9
-rw-r--r--spec/unit/plugins/eucalyptus_spec.rb11
-rw-r--r--spec/unit/plugins/linode_spec.rb9
-rw-r--r--spec/unit/plugins/rackspace_spec.rb9
5 files changed, 0 insertions, 60 deletions
diff --git a/spec/unit/plugins/digital_ocean_spec.rb b/spec/unit/plugins/digital_ocean_spec.rb
index bbe7656c..11c42644 100644
--- a/spec/unit/plugins/digital_ocean_spec.rb
+++ b/spec/unit/plugins/digital_ocean_spec.rb
@@ -172,26 +172,4 @@ describe Ohai::System, "plugin digital_ocean" do
it_should_behave_like "!digital_ocean"
end
end
-
- context "with ec2 hint file" do
- before do
- allow(plugin).to receive(:hint?).with("ec2").and_return({})
- allow(plugin).to receive(:hint?).with("digital_ocean").and_return(false)
- end
-
- describe "with the /etc/digitalocean file" do
- before do
- allow(File).to receive(:exist?).with(digitalocean_path).and_return(true)
- plugin.run
- end
- it_should_behave_like "digital_ocean_networking"
- end
-
- describe "without the /etc/digitalocean file" do
- before do
- allow(File).to receive(:exist?).with(digitalocean_path).and_return(false)
- end
- it_should_behave_like "!digital_ocean"
- end
- end
end
diff --git a/spec/unit/plugins/ec2_spec.rb b/spec/unit/plugins/ec2_spec.rb
index 35b4d7d9..df0f00d0 100644
--- a/spec/unit/plugins/ec2_spec.rb
+++ b/spec/unit/plugins/ec2_spec.rb
@@ -288,15 +288,6 @@ describe Ohai::System, "plugin ec2" do
allow(plugin).to receive(:hint?).with("ec2").and_return({})
end
end
-
- describe "with rackspace hint file" do
- it_behaves_like "!ec2"
-
- before(:each) do
- allow(plugin).to receive(:hint?).with("rackspace").and_return(true)
- end
- end
-
describe "without any hints that it is an ec2 system" do
it_behaves_like "!ec2"
diff --git a/spec/unit/plugins/eucalyptus_spec.rb b/spec/unit/plugins/eucalyptus_spec.rb
index 43dc62f1..e834b430 100644
--- a/spec/unit/plugins/eucalyptus_spec.rb
+++ b/spec/unit/plugins/eucalyptus_spec.rb
@@ -102,15 +102,4 @@ describe Ohai::System, "plugin eucalyptus" do
end
end
- describe "with ec2 hint file" do
- it_behaves_like "!eucalyptus"
-
- before(:each) do
- plugin[:network] = { :interfaces => {} }
-
- allow(plugin).to receive(:hint?).with("eucalyptus").and_return(false)
- allow(plugin).to receive(:hint?).with("ec2").and_return({})
- end
- end
-
end
diff --git a/spec/unit/plugins/linode_spec.rb b/spec/unit/plugins/linode_spec.rb
index 42d8565e..43c43f39 100644
--- a/spec/unit/plugins/linode_spec.rb
+++ b/spec/unit/plugins/linode_spec.rb
@@ -132,13 +132,4 @@ describe Ohai::System, "plugin linode" do
it_behaves_like "!linode"
end
- context "with ec2 hint file" do
- before do
- allow(plugin).to receive(:hint?).with("linode").and_return(false)
- allow(plugin).to receive(:hint?).with("ec2").and_return({})
- end
-
- it_behaves_like "!linode"
- end
-
end
diff --git a/spec/unit/plugins/rackspace_spec.rb b/spec/unit/plugins/rackspace_spec.rb
index e4f8f1e3..e3d76e50 100644
--- a/spec/unit/plugins/rackspace_spec.rb
+++ b/spec/unit/plugins/rackspace_spec.rb
@@ -224,15 +224,6 @@ OUT
end
end
- describe "with ec2 hint file and no rackspace hint file" do
- it_behaves_like "!rackspace"
-
- before(:each) do
- allow(plugin).to receive(:hint?).with("ec2").and_return({})
- allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
- end
- end
-
describe "xenstore provider returns rackspace" do
it_behaves_like "rackspace"