Author: svn-role
Date: Fri Apr 13 04:01:13 2012
New Revision: 1325603
URL: http://svn.apache.org/viewvc?rev=1325603&view=rev
Log:
Merge the r1310535 group from trunk:
* r1310535, r1310594
Handle APR Hash order changes in Ruby bindings test expectations.
Justification:
Avoid spurious test failures.
Votes:
+1: joeswatosh
+0: hwright
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/test_client.rb
subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/test_wc.rb
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1310535,1310594
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1325603&r1=1325602&r2=1325603&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Apr 13 04:01:13 2012
@@ -144,14 +144,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1310535, r1310594
- Handle APR Hash order changes in Ruby bindings test expectations.
- Justification:
- Avoid spurious test failures.
- Votes:
- +1: joeswatosh
- +0: hwright
-
* r1311935
Fix a pool lifetime problem in the diff code.
Justification:
Modified:
subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/test_client.rb
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/test_client.rb?rev=1325603&r1=1325602&r2=1325603&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/test_client.rb
(original)
+++ subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/test_client.rb
Fri Apr 13 04:01:13 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
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
Modified:
subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/test_wc.rb
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/test_wc.rb?rev=1325603&r1=1325602&r2=1325603&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/test_wc.rb
(original)
+++ subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/test_wc.rb Fri
Apr 13 04:01:13 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
