fix spurious failures in ruby test suite (upstream r1327373)

This commit is contained in:
Joe Orton 2013-05-09 16:37:49 +01:00
parent bf858c512b
commit 0aff876c83
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,23 @@
http://svn.apache.org/viewvc?view=revision&revision=1327373
--- subversion-1.7.9/subversion/bindings/swig/ruby/test/test_wc.rb.swighash
+++ subversion-1.7.9/subversion/bindings/swig/ruby/test/test_wc.rb
@@ -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

View File

@ -26,7 +26,7 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.7.9
Release: 2%{?dist}
Release: 3%{?dist}
License: ASL 2.0
Group: Development/Tools
URL: http://subversion.apache.org/
@ -45,6 +45,7 @@ Patch4: subversion-1.7.2-ruby19.patch
Patch7: subversion-1.7.4-kwallet2.patch
Patch8: subversion-1.7.4-sqlitever.patch
Patch9: subversion-1.7.9-rubybind.patch
Patch10: subversion-1.7.9-swighash.patch
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@ -183,6 +184,7 @@ This package includes supplementary tools for use with Subversion.
%patch7 -p1 -b .kwallet2
%patch8 -p1 -b .sqlitever
%patch9 -p1 -b .rubybind
%patch10 -p1 -b .swighash
%build
# Regenerate the buildsystem, so that:
@ -469,6 +471,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
* Thu May 9 2013 Joe Orton <jorton@redhat.com> - 1.7.9-3
- fix spurious failures in ruby test suite (upstream r1327373)
* Thu May 9 2013 Joe Orton <jorton@redhat.com> - 1.7.9-2
- try harder to avoid svnserve bind failures in ruby binding tests
- enable verbose output for ruby binding tests