1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
From: Hleb Valoshka <375gnu@gmail.com>
Date: Mon, 17 Aug 2015 15:45:46 +0300
Subject: Try to wait until socket is free
---
test/helper.rb | 3 +++
test/test_auth.rb | 38 ++++++++++++++++++++++++--------------
test/test_http-access2.rb | 3 +++
test/test_httpclient.rb | 3 +++
test/test_ssl.rb | 3 +++
5 files changed, 36 insertions(+), 14 deletions(-)
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -76,6 +76,9 @@ module Helper
)
@proxyport = @proxyserver.config[:Port]
@proxyserver_thread = start_server_thread(@proxyserver)
+ rescue Errno::EADDRINUSE
+ sleep 1
+ retry
end
def teardown_client
--- a/test/test_auth.rb
+++ b/test/test_auth.rb
@@ -18,13 +18,18 @@ class TestAuth < Test::Unit::TestCase
end
def setup_server
- @server = WEBrick::HTTPServer.new(
- :BindAddress => "localhost",
- :Logger => @logger,
- :Port => 50000,
- :AccessLog => [],
- :DocumentRoot => File.dirname(File.expand_path(__FILE__))
- )
+ begin
+ @server = WEBrick::HTTPServer.new(
+ :BindAddress => "localhost",
+ :Logger => @logger,
+ :Port => 50000,
+ :AccessLog => [],
+ :DocumentRoot => File.dirname(File.expand_path(__FILE__))
+ )
+ rescue Errno::EADDRINUSE
+ sleep 1
+ retry
+ end
@serverport = @server.config[:Port]
@server.mount(
'/basic_auth',
@@ -84,13 +89,18 @@ class TestAuth < Test::Unit::TestCase
:UserDB => htdigest_userdb
)
- @proxyserver = WEBrick::HTTPProxyServer.new(
- :ProxyAuthProc => @proxy_digest_auth.method(:authenticate).to_proc,
- :BindAddress => "localhost",
- :Logger => @proxylogger,
- :Port => 50001,
- :AccessLog => []
- )
+ begin
+ @proxyserver = WEBrick::HTTPProxyServer.new(
+ :ProxyAuthProc => @proxy_digest_auth.method(:authenticate).to_proc,
+ :BindAddress => "localhost",
+ :Logger => @proxylogger,
+ :Port => 50001,
+ :AccessLog => []
+ )
+ rescue Errno::EADDRINUSE
+ sleep 1
+ retry
+ end
@proxyport = @proxyserver.config[:Port]
@proxyserver_thread = start_server_thread(@proxyserver)
end
--- a/test/test_http-access2.rb
+++ b/test/test_http-access2.rb
@@ -398,6 +398,9 @@ private
end
@server.mount('/servlet', TestServlet.new(@server))
@server_thread = start_server_thread(@server)
+ rescue Errno::EADDRINUSE
+ sleep 1
+ retry
end
def escape_noproxy
--- a/test/test_httpclient.rb
+++ b/test/test_httpclient.rb
@@ -1879,6 +1879,9 @@ private
end
@server.mount('/servlet', TestServlet.new(@server))
@server_thread = start_server_thread(@server)
+ rescue Errno::EADDRINUSE
+ sleep 1
+ retry
end
def add_query_string(req)
--- a/test/test_ssl.rb
+++ b/test/test_ssl.rb
@@ -285,6 +285,9 @@ private
)
end
@server_thread = start_server_thread(@server)
+ rescue Errno::EADDRINUSE
+ sleep 1
+ retry
end
def setup_server_with_ssl_version(ssl_version)
@@ -310,6 +313,9 @@ private
)
end
@server_thread = start_server_thread(@server)
+ rescue Errno::EADDRINUSE
+ sleep 1
+ retry
end
def do_hello(req, res)
--- a/test/test_jsonclient.rb
+++ b/test/test_jsonclient.rb
@@ -76,5 +76,8 @@ class TestJSONClient < Test::Unit::TestC
@serverport = @server.config[:Port]
@server.mount('/json', JSONServlet.new(@server))
@server_thread = start_server_thread(@server)
+ rescue Errno::EADDRINUSE
+ sleep 1
+ retry
end
end
|
