[Pkg-puppet-devel] [facter] 100/180: Revert "(maint) Ensure specs don't generate flattened ec2 facts"

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 29ebad9e7737578e72466fe37009b8e9e118e711
Author: Kylo Ginsberg <kylo at puppetlabs.com>
Date:   Fri May 23 13:15:06 2014 -0700

    Revert "(maint) Ensure specs don't generate flattened ec2 facts"
    
    This reverts commit a417998966928c55dd0ed104608b7ac4311c3a62.
---
 spec/unit/ec2_spec.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/spec/unit/ec2_spec.rb b/spec/unit/ec2_spec.rb
index 28ad20a..109c970 100755
--- a/spec/unit/ec2_spec.rb
+++ b/spec/unit/ec2_spec.rb
@@ -6,11 +6,9 @@ describe "ec2_metadata" do
 
   before do
     Facter::EC2::Metadata.stubs(:new).returns querier
-
+    Facter.collection.internal_loader.load(:ec2)
     # Prevent flattened facts from forcing evaluation of the ec2 metadata fact
     Facter.stubs(:value).with(:ec2_metadata)
-    Facter.collection.internal_loader.load(:ec2)
-    Facter.unstub(:value)
   end
 
   subject { Facter.fact(:ec2_metadata).resolution(:rest) }
@@ -56,11 +54,7 @@ describe "ec2_userdata" do
 
   before do
     Facter::EC2::Userdata.stubs(:new).returns querier
-
-    # Prevent flattened facts from forcing evaluation of the ec2 metadata fact
-    Facter.stubs(:value).with(:ec2_metadata)
     Facter.collection.internal_loader.load(:ec2)
-    Facter.unstub(:value)
   end
 
   subject { Facter.fact(:ec2_userdata).resolution(:rest) }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git