You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/09/11 15:14:56 UTC
svn commit: r1383398 - in
/subversion/branches/1.6.x-testsuite-apr-hash-order: ./
subversion/bindings/swig/ruby/test/test_client.rb
subversion/bindings/swig/ruby/test/test_wc.rb
Author: stsp
Date: Tue Sep 11 13:14:56 2012
New Revision: 1383398
URL: http://svn.apache.org/viewvc?rev=1383398&view=rev
Log:
On the 1.6.x-testsuite-apr-hash-order branch, merge r1310535 and r1310594
from trunk. Fixes swig-rb tests to run with APR 1.4.6
Modified:
subversion/branches/1.6.x-testsuite-apr-hash-order/ (props changed)
subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/bindings/swig/ruby/test/test_client.rb
subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/bindings/swig/ruby/test/test_wc.rb
Propchange: subversion/branches/1.6.x-testsuite-apr-hash-order/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1310535,1310594
Modified: subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/bindings/swig/ruby/test/test_client.rb
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/bindings/swig/ruby/test/test_client.rb?rev=1383398&r1=1383397&r2=1383398&view=diff
==============================================================================
--- subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/bindings/swig/ruby/test/test_client.rb (original)
+++ subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/bindings/swig/ruby/test/test_client.rb Tue Sep 11 13:14:56 2012
@@ -2303,7 +2303,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
end
end
@@ -2313,6 +2315,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
Modified: subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/bindings/swig/ruby/test/test_wc.rb
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/bindings/swig/ruby/test/test_wc.rb?rev=1383398&r1=1383397&r2=1383398&view=diff
==============================================================================
--- subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/bindings/swig/ruby/test/test_wc.rb (original)
+++ subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/bindings/swig/ruby/test/test_wc.rb Tue Sep 11 13:14:56 2012
@@ -731,14 +731,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