Author: hwright
Date: Wed Aug 17 13:50:49 2011
New Revision: 1158703
URL: http://svn.apache.org/viewvc?rev=1158703&view=rev
Log:
Merge r1154908 from trunk:
* r1154908
Fix spurious test failures in Ruby bindings.
Justification:
Spurious test failures are a huge distraction and time sink when
signing releases.
Votes:
+1: stsp
+1: rhuijben (safe change. Doesn't break code and probably fixes tests)
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/util.rb
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 13:50:49 2011
@@ -56,4 +56,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154908,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158703&r1=1158702&r2=1158703&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:50:49 2011
@@ -207,12 +207,3 @@ Approved changes:
Help texts should document the current behaviour, not past behaviour.
Votes:
+1: stsp, rhuijben, cmpilato
-
- * r1154908
- Fix spurious test failures in Ruby bindings.
- Justification:
- Spurious test failures are a huge distraction and time sink when
- signing releases.
- Votes:
- +1: stsp
- +1: rhuijben (safe change. Doesn't break code and probably fixes tests)
\ No newline at end of file
Modified: subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/util.rb
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/util.rb?rev=1158703&r1=1158702&r2=1158703&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/util.rb
(original)
+++ subversion/branches/1.7.x/subversion/bindings/swig/ruby/test/util.rb Wed
Aug 17 13:50:49 2011
@@ -262,7 +262,7 @@ realm = #{@realm}
"svn://#{@svnserve_host}:#{@svnserve_port}#{@full_repos_path}"
# Avoid a race by waiting a short time for svnserve to start up.
# Without this, tests can fail with "Connection refused" errors.
- sleep 0.1
+ sleep 1
break
end
end
