joeswat...@apache.org wrote on Fri, Apr 06, 2012 at 18:28:30 -0000:
> Author: joeswatosh
> Date: Fri Apr 6 18:28:30 2012
> New Revision: 1310535
>
> URL: http://svn.apache.org/viewvc?rev=1310535&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_client.rb
> (SvnClientTest#test_changelists_get_with_block,
> SvnClientTest#test_changelists_get_without_block): Sort the contents of
> the
> changelists returned by the block passed to assert_changelists, so they
> will
> match the expectations.
>
> Modified:
> subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
>
> Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb?rev=1310535&r1=1310534&r2=1310535&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
> (original)
> +++ subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb Fri
> Apr 6 18:28:30 2012
> @@ -2341,7 +2341,9 @@ class SvnClientTest < Test::Unit::TestCa
>
> def test_changelists_get_without_block
> assert_changelists do |ctx, changelist_name|
> - ctx.changelists(changelist_name, @wc_path)
> + changelists = ctx.changelists(changelist_name, @wc_path)
> + changelists.each_value { |v| v.sort! }
> + changelists
Do you need to sort CHANGELISTS, or only the values therein?
Don't this and your other recent commit need to be backported to 1.7.x?
> end
> end
>
> @@ -2351,6 +2353,7 @@ class SvnClientTest < Test::Unit::TestCa
> ctx.changelists(changelist_name, @wc_path) do |path,cl_name|
> changelists[cl_name] << path
> end
> + changelists.each_value { |v| v.sort! }
> changelists
> end
> end
>
>
