cpython: 7136304ecf4c (original) (raw)

Mercurial > cpython

changeset 102796:7136304ecf4c 2.7

Issue #27614: Avoid race in test_docxmlrpc server setup [#27614]

Martin Panter vadmium+py@gmail.com
date	Thu, 18 Aug 2016 06:12:22 +0000
parents	7669fb39a9ce
children	03dc2f3fa0c6
files	Lib/test/test_docxmlrpc.py
diffstat	1 files changed, 11 insertions(+), 29 deletions(-)[+] [-] Lib/test/test_docxmlrpc.py 40

line wrap: on

line diff

--- a/Lib/test/test_docxmlrpc.py +++ b/Lib/test/test_docxmlrpc.py @@ -3,12 +3,8 @@ import httplib import sys from test import test_support threading = test_support.import_module('threading') -import time -import socket import unittest -PORT = None - def make_request_and_skipIf(condition, reason): # If we skip the test, we have to make a request because # the server created in setUp blocks expecting one to come in. @@ -23,13 +19,10 @@ def make_request_and_skipIf(condition, r return decorator -def server(evt, numrequests): +def make_server(): serv = DocXMLRPCServer(("localhost", 0), logRequests=False) try:

```
   global PORT[](#l1.25)
```

   PORT = serv.socket.getsockname()[1][](#l1.26)

- # Add some documentation serv.set_server_title("DocXMLRPCServer Test Documentation") serv.set_server_name("DocXMLRPCServer Test Docs") @@ -56,42 +49,31 @@ def server(evt, numrequests): serv.register_function(add) serv.register_function(lambda x, y: x-y) -

```
   while numrequests > 0:[](#l1.36)
```
```
       serv.handle_request()[](#l1.37)
```
```
       numrequests -= 1[](#l1.38)
```
except socket.timeout:
```
   pass[](#l1.40)
```
finally:

```
   return serv[](#l1.42)
```
except: serv.server_close()

```
   PORT = None[](#l1.45)
```
```
   evt.set()[](#l1.46)
```

```
   raise[](#l1.47)
```

class DocXMLRPCHTTPGETServer(unittest.TestCase): def setUp(self):

   self._threads = test_support.threading_setup()[](#l1.51)
   # Enable server feedback[](#l1.52)
   DocXMLRPCServer._send_traceback_header = True[](#l1.53)

   self.evt = threading.Event()[](#l1.55)

   threading.Thread(target=server, args=(self.evt, 1)).start()[](#l1.56)

```
   self.serv = make_server()[](#l1.57)
```

   self.thread = threading.Thread(target=self.serv.serve_forever)[](#l1.58)

```
   self.thread.start()[](#l1.59)
```

   # wait for port to be assigned[](#l1.61)

```
   n = 1000[](#l1.62)
```

   while n > 0 and PORT is None:[](#l1.63)

```
       time.sleep(0.001)[](#l1.64)
```
```
       n -= 1[](#l1.65)
```

   PORT = self.serv.server_address[1][](#l1.67)
   self.client = httplib.HTTPConnection("localhost:%d" % PORT)[](#l1.68)

def tearDown(self): self.client.close()

```
   self.evt.wait()[](#l1.73)
```

- # Disable server feedback DocXMLRPCServer._send_traceback_header = False

   test_support.threading_cleanup(*self._threads)[](#l1.77)

```
   self.serv.shutdown()[](#l1.78)
```
```
   self.thread.join()[](#l1.79)
```
```
   self.serv.server_close()[](#l1.80)
```

def test_valid_get_response(self): self.client.request("GET", "/")