2013-05-09 11:25:30 +00:00
|
|
|
|
|
|
|
|
Try a little harder to avoid svnserve() bind failures.
|
|
|
|
|
|
2013-06-18 15:36:04 +00:00
|
|
|
--- subversion-1.8.0/subversion/bindings/swig/ruby/test/util.rb.rubybind
|
|
|
|
|
+++ subversion-1.8.0/subversion/bindings/swig/ruby/test/util.rb
|
|
|
|
|
@@ -39,7 +39,8 @@ module SvnTestUtil
|
|
|
|
|
@realm = "sample realm"
|
|
|
|
|
|
2013-05-09 11:25:30 +00:00
|
|
|
@svnserve_host = "127.0.0.1"
|
|
|
|
|
- @svnserve_ports = (64152..64282).collect{|x| x.to_s}
|
|
|
|
|
+ sport = (50000 + rand(100) * 100)
|
|
|
|
|
+ @svnserve_ports = (sport..sport + 99).collect{|x| x.to_s}
|
2013-06-18 15:36:04 +00:00
|
|
|
|
|
|
|
|
@tmp_path = Dir.mktmpdir
|
|
|
|
|
@wc_path = File.join(@tmp_path, "wc")
|
|
|
|
|
@@ -252,6 +253,8 @@ realm = #{@realm}
|
2013-05-09 11:25:30 +00:00
|
|
|
"--listen-port", port,
|
|
|
|
|
"-d", "--foreground")
|
|
|
|
|
}
|
|
|
|
|
+ # wait a while for svnserve to attempt a bind() and possibly fail
|
|
|
|
|
+ sleep(1)
|
|
|
|
|
pid, status = Process.waitpid2(@svnserve_pid, Process::WNOHANG)
|
|
|
|
|
if status and status.exited?
|
|
|
|
|
if $DEBUG
|
