summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Javorski <mike.javorski@gmail.com>2013-04-12 16:27:55 -0700
committerMike Javorski <mike.javorski@gmail.com>2013-04-12 16:28:21 -0700
commitc19b4928f49a312ba4160a03c5253ce680e89b99 (patch)
tree3931a759230c48a56af7eae0e74f00ef44830a08
parentdb97a05d334ce1014c4f72074de3571afb122d7a (diff)
downloadohai-c19b4928f49a312ba4160a03c5253ce680e89b99.tar.gz
Revert db97a05 "Extend EC2 mixin specs..." as btm has added an additional spec.
-rw-r--r--spec/unit/plugins/ec2_spec.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/spec/unit/plugins/ec2_spec.rb b/spec/unit/plugins/ec2_spec.rb
index 0448dc91..e27788f4 100644
--- a/spec/unit/plugins/ec2_spec.rb
+++ b/spec/unit/plugins/ec2_spec.rb
@@ -44,14 +44,7 @@ describe Ohai::System, "plugin ec2" do
Socket.stub!(:new).and_return(t)
@http_client.should_receive(:get).
with("/").twice.
- and_return(mock("Net::HTTP Response", :body => "1.0\n2011-05-01\n2012-01-12\nUnsupported", :code => "200"))
- end
-
- it "should determine the best supported ec2 metadata api version" do
- @http_client.should_receive(:get).
- with("/2012-01-12/meta-data/").
- and_return(mock("Net::HTTP Response", :body => "", :code => "200"))
- @ohai._require_plugin("ec2")
+ and_return(mock("Net::HTTP Response", :body => "2012-01-12", :code => "200"))
end
it "should recursively fetch all the ec2 metadata" do