subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joeswat...@apache.org
Subject svn commit: r1327373 - /subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb
Date Wed, 18 Apr 2012 04:52:34 GMT
Author: joeswatosh
Date: Wed Apr 18 04:52:34 2012
New Revision: 1327373

URL: http://svn.apache.org/viewvc?rev=1327373&view=rev
Log:
Since the change to the APR hash function, the order that some data are returned
from some APIs are no longer determinate. Sort the data before comparing to get
the buildbots passing again.

* subversion/bindings/swig/ruby/test/test_wc.rb
  (SvnWcTest#test_ancestry): Sort the ignored_errors before comparing to the
   expecatation.

Modified:
    subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb

Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb?rev=1327373&r1=1327372&r2=1327373&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb Wed Apr 18 04:52:34 2012
@@ -326,12 +326,16 @@ class SvnWcTest < Test::Unit::TestCase
         ignored_errors = []
         callbacks.ignored_errors = ignored_errors
         access.walk_entries(@wc_path, callbacks)
+        sorted_ignored_errors = ignored_errors.sort_by {|path, err| path}
+        sorted_ignored_errors = sorted_ignored_errors.collect! do |path, err| 
+          [path, err.class]
+        end
         assert_equal([
                       [@wc_path, Svn::Error::Cancelled],
                       [path1, Svn::Error::Cancelled],
                       [path2, Svn::Error::Cancelled],
                      ],
-                     ignored_errors.collect {|path, err| [path, err.class]})
+                     sorted_ignored_errors)
       end
     end
   end



Mime
View raw message