(puppetlabs/puppet) Fixed hash ordering dependency in a test

[weareth...@puppetlabs.com]

Please review pull request #731: Fixed hash ordering dependency in a test opened by (zaphod42)

Description:

Seen as a failure in CI when we started adding more patchlevels of ruby
to test against. Fix is a backport of the fix that appears on the 2.7.x
branch.

• Opened: Wed May 02 18:53:47 UTC 2012
• Based on: puppetlabs:2.6.x (d174a9f28a66819bedfead803765d22e2c04411a)
• Requested merge: zaphod42:bug/2.6.x/hash-ordering-dependency-in-test (d419497e7f2202c1060d182fd98e749b20794ea8)

Diff follows:

diff --git a/spec/integration/indirector/file_content/file_server_spec.rb b/spec/integration/indirector/file_content/file_server_spec.rb
index 5de7f1d..e22d2d8 100755
--- a/spec/integration/indirector/file_content/file_server_spec.rb
+++ b/spec/integration/indirector/file_content/file_server_spec.rb
@@ -38,8 +38,8 @@
 
     result.should_not be_nil
     result.length.should == 2
-    result[1].should be_instance_of(Puppet::FileServing::Content)
-    result[1].content.should == "1\n"
+    result.map {|x| x.should be_instance_of(Puppet::FileServing::Content) }
+    result.find {|x| x.relative_path == 'file.rb' }.content.should == "1\n"
   end
 
   it "should find file content in modules" do

    

[weareth...@puppetlabs.com]

On Thu May 03 19:11:32 UTC 2012 pull request #731 was closed.

Fixed hash ordering dependency in a test requested by (zaphod42)

The pull request was merged by: daniel-pittman