Author: joeswatosh
Date: Fri Apr 6 21:15:48 2012
New Revision: 1310594
URL: http://svn.apache.org/viewvc?rev=1310594&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#assert_diff_callbacks): Sort the results of the diff API call as
the contents are what is important, not the order.
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=1310594&r1=1310593&r2=1310594&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb Fri Apr 6
21:15:48 2012
@@ -747,14 +747,15 @@ EOE
:file_changed_prop_name => prop_name,
:file_changed_prop_value => prop_value,
}
- expected_props, actual_result = yield(property_info,
callbacks.result)
+ sorted_result = callbacks.result.sort_by {|r| r.first.to_s}
+ expected_props, actual_result = yield(property_info, sorted_result)
dir_changed_props, file_changed_props, empty_changed_props =
expected_props
assert_equal([
[:dir_props_changed, @wc_path, dir_changed_props],
- [:file_changed, path1, file_changed_props],
[:file_added, path2, empty_changed_props],
+ [:file_changed, path1, file_changed_props],
],
- callbacks.result)
+ sorted_result)
end
end
end
