Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d874c055
Commit
d874c055
authored
Aug 20, 2016
by
Martin Panter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #27614: Avoid race in test_docxmlrpc server setup
parent
68c1f1ed
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
30 deletions
+11
-30
Lib/test/test_docxmlrpc.py
Lib/test/test_docxmlrpc.py
+11
-30
No files found.
Lib/test/test_docxmlrpc.py
View file @
d874c055
...
@@ -3,12 +3,8 @@ import http.client
...
@@ -3,12 +3,8 @@ import http.client
import
sys
import
sys
from
test
import
support
from
test
import
support
threading
=
support
.
import_module
(
'threading'
)
threading
=
support
.
import_module
(
'threading'
)
import
time
import
socket
import
unittest
import
unittest
PORT
=
None
def
make_request_and_skipIf
(
condition
,
reason
):
def
make_request_and_skipIf
(
condition
,
reason
):
# If we skip the test, we have to make a request because
# If we skip the test, we have to make a request because
# the server created in setUp blocks expecting one to come in.
# the server created in setUp blocks expecting one to come in.
...
@@ -23,13 +19,10 @@ def make_request_and_skipIf(condition, reason):
...
@@ -23,13 +19,10 @@ def make_request_and_skipIf(condition, reason):
return
decorator
return
decorator
def
server
(
evt
,
numrequests
):
def
make_server
(
):
serv
=
DocXMLRPCServer
((
"localhost"
,
0
),
logRequests
=
False
)
serv
=
DocXMLRPCServer
((
"localhost"
,
0
),
logRequests
=
False
)
try
:
try
:
global
PORT
PORT
=
serv
.
socket
.
getsockname
()[
1
]
# Add some documentation
# Add some documentation
serv
.
set_server_title
(
"DocXMLRPCServer Test Documentation"
)
serv
.
set_server_title
(
"DocXMLRPCServer Test Documentation"
)
serv
.
set_server_name
(
"DocXMLRPCServer Test Docs"
)
serv
.
set_server_name
(
"DocXMLRPCServer Test Docs"
)
...
@@ -66,43 +59,31 @@ def server(evt, numrequests):
...
@@ -66,43 +59,31 @@ def server(evt, numrequests):
serv
.
register_function
(
lambda
x
,
y
:
x
-
y
)
serv
.
register_function
(
lambda
x
,
y
:
x
-
y
)
serv
.
register_function
(
annotation
)
serv
.
register_function
(
annotation
)
serv
.
register_instance
(
ClassWithAnnotation
())
serv
.
register_instance
(
ClassWithAnnotation
())
return
serv
while
numrequests
>
0
:
except
:
serv
.
handle_request
()
numrequests
-=
1
except
socket
.
timeout
:
pass
finally
:
serv
.
server_close
()
serv
.
server_close
()
PORT
=
None
raise
evt
.
set
()
class
DocXMLRPCHTTPGETServer
(
unittest
.
TestCase
):
class
DocXMLRPCHTTPGETServer
(
unittest
.
TestCase
):
def
setUp
(
self
):
def
setUp
(
self
):
self
.
_threads
=
support
.
threading_setup
()
# Enable server feedback
# Enable server feedback
DocXMLRPCServer
.
_send_traceback_header
=
True
DocXMLRPCServer
.
_send_traceback_header
=
True
self
.
evt
=
threading
.
Event
()
self
.
serv
=
make_server
()
threading
.
Thread
(
target
=
server
,
args
=
(
self
.
evt
,
1
)).
start
()
self
.
thread
=
threading
.
Thread
(
target
=
self
.
serv
.
serve_forever
)
self
.
thread
.
start
()
# wait for port to be assigned
deadline
=
time
.
monotonic
()
+
10.0
while
PORT
is
None
:
time
.
sleep
(
0.010
)
if
time
.
monotonic
()
>
deadline
:
break
PORT
=
self
.
serv
.
server_address
[
1
]
self
.
client
=
http
.
client
.
HTTPConnection
(
"localhost:%d"
%
PORT
)
self
.
client
=
http
.
client
.
HTTPConnection
(
"localhost:%d"
%
PORT
)
def
tearDown
(
self
):
def
tearDown
(
self
):
self
.
client
.
close
()
self
.
client
.
close
()
self
.
evt
.
wait
()
# Disable server feedback
# Disable server feedback
DocXMLRPCServer
.
_send_traceback_header
=
False
DocXMLRPCServer
.
_send_traceback_header
=
False
support
.
threading_cleanup
(
*
self
.
_threads
)
self
.
serv
.
shutdown
()
self
.
thread
.
join
()
self
.
serv
.
server_close
()
def
test_valid_get_response
(
self
):
def
test_valid_get_response
(
self
):
self
.
client
.
request
(
"GET"
,
"/"
)
self
.
client
.
request
(
"GET"
,
"/"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment