2007-12-09 18:39:12 -04:00
|
|
|
from DocXMLRPCServer import DocXMLRPCServer
|
|
|
|
import httplib
|
|
|
|
from test import test_support
|
|
|
|
import threading
|
|
|
|
import time
|
Merged revisions 78035,78040,78043,78049-78050,78052-78054 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78035 | georg.brandl | 2010-02-06 23:44:17 +0100 (Sa, 06 Feb 2010) | 1 line
Fix duplicate import.
........
r78040 | georg.brandl | 2010-02-07 00:08:00 +0100 (So, 07 Feb 2010) | 1 line
Fix a few UnboundLocalErrors in test_long.
........
r78043 | georg.brandl | 2010-02-07 00:12:19 +0100 (So, 07 Feb 2010) | 1 line
Remove duplicate test method.
........
r78049 | georg.brandl | 2010-02-07 00:33:33 +0100 (So, 07 Feb 2010) | 1 line
Fix import/access for some identifiers. _TestSharedCTypes does not seem to be executed?
........
r78050 | georg.brandl | 2010-02-07 00:34:10 +0100 (So, 07 Feb 2010) | 1 line
Fix more unbound locals in code paths that do not seem to be used.
........
r78052 | georg.brandl | 2010-02-07 00:54:04 +0100 (So, 07 Feb 2010) | 1 line
Add missing import when running these tests standalone.
........
r78053 | georg.brandl | 2010-02-07 00:54:43 +0100 (So, 07 Feb 2010) | 1 line
Fix some name errors in Mac modules.
........
r78054 | georg.brandl | 2010-02-07 00:58:25 +0100 (So, 07 Feb 2010) | 1 line
Add missing import.
........
2010-02-07 08:01:19 -04:00
|
|
|
import socket
|
2007-12-09 18:39:12 -04:00
|
|
|
import unittest
|
|
|
|
import xmlrpclib
|
|
|
|
|
|
|
|
PORT = None
|
|
|
|
|
|
|
|
def server(evt, numrequests):
|
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66766 | benjamin.peterson | 2008-10-03 06:52:06 -0500 (Fri, 03 Oct 2008) | 1 line
update the mac installer script
................
r66767 | andrew.kuchling | 2008-10-03 07:26:42 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring typo.
................
r66771 | hirokazu.yamamoto | 2008-10-03 11:18:42 -0500 (Fri, 03 Oct 2008) | 2 lines
Fixed following error when DocXMLRPCServer failed.
UnboundLocalError: local variable 'serv' referenced before assignment
................
r66772 | andrew.kuchling | 2008-10-03 11:29:19 -0500 (Fri, 03 Oct 2008) | 1 line
Mention exception in docstring
................
r66774 | andrew.kuchling | 2008-10-03 11:42:52 -0500 (Fri, 03 Oct 2008) | 1 line
Typo fix
................
r66776 | hirokazu.yamamoto | 2008-10-03 12:34:49 -0500 (Fri, 03 Oct 2008) | 2 lines
Issue #1706863: Fixed "'NoneType' object has no attribute 'rfind'" error when sqlite libfile not found.
................
r66783 | andrew.kuchling | 2008-10-03 20:02:29 -0500 (Fri, 03 Oct 2008) | 1 line
Use correct capitalization of NaN
................
r66784 | andrew.kuchling | 2008-10-03 20:03:42 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring change: Specify exception raised
................
r66785 | andrew.kuchling | 2008-10-03 20:04:24 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring changes: Specify exceptions raised
................
r66786 | andrew.kuchling | 2008-10-03 20:05:56 -0500 (Fri, 03 Oct 2008) | 3 lines
Docstring change for *partition: use same tense as other docstrings.
Hyphenate left- and right-justified.
Fix 'registerd' typo
................
r66787 | andrew.kuchling | 2008-10-03 22:08:56 -0500 (Fri, 03 Oct 2008) | 1 line
two corrections
................
r66790 | andrew.kuchling | 2008-10-04 11:52:01 -0500 (Sat, 04 Oct 2008) | 1 line
Set svn:keywords
................
r66793 | georg.brandl | 2008-10-04 13:26:01 -0500 (Sat, 04 Oct 2008) | 2 lines
#4041: don't refer to removed and outdated modules.
................
r66797 | benjamin.peterson | 2008-10-04 15:55:50 -0500 (Sat, 04 Oct 2008) | 19 lines
Merged revisions 66707,66775,66782 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66707 | benjamin.peterson | 2008-09-30 18:27:10 -0500 (Tue, 30 Sep 2008) | 1 line
fix #4001: fix_imports didn't check for __init__.py before converting to relative imports
........
r66775 | collin.winter | 2008-10-03 12:08:26 -0500 (Fri, 03 Oct 2008) | 4 lines
Add an alternative iterative pattern matching system that, while slower, correctly parses files that cause the faster recursive pattern matcher to fail with a recursion error. lib2to3 falls back to the iterative matcher if the recursive one fails.
Fixes http://bugs.python.org/issue2532. Thanks to Nick Edds.
........
r66782 | benjamin.peterson | 2008-10-03 17:51:36 -0500 (Fri, 03 Oct 2008) | 1 line
add Victor Stinner's fixer for os.getcwdu -> os.getcwd #4023
........
................
2008-10-04 18:33:08 -03:00
|
|
|
serv = DocXMLRPCServer(("localhost", 0), logRequests=False)
|
2007-12-09 18:39:12 -04:00
|
|
|
|
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66766 | benjamin.peterson | 2008-10-03 06:52:06 -0500 (Fri, 03 Oct 2008) | 1 line
update the mac installer script
................
r66767 | andrew.kuchling | 2008-10-03 07:26:42 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring typo.
................
r66771 | hirokazu.yamamoto | 2008-10-03 11:18:42 -0500 (Fri, 03 Oct 2008) | 2 lines
Fixed following error when DocXMLRPCServer failed.
UnboundLocalError: local variable 'serv' referenced before assignment
................
r66772 | andrew.kuchling | 2008-10-03 11:29:19 -0500 (Fri, 03 Oct 2008) | 1 line
Mention exception in docstring
................
r66774 | andrew.kuchling | 2008-10-03 11:42:52 -0500 (Fri, 03 Oct 2008) | 1 line
Typo fix
................
r66776 | hirokazu.yamamoto | 2008-10-03 12:34:49 -0500 (Fri, 03 Oct 2008) | 2 lines
Issue #1706863: Fixed "'NoneType' object has no attribute 'rfind'" error when sqlite libfile not found.
................
r66783 | andrew.kuchling | 2008-10-03 20:02:29 -0500 (Fri, 03 Oct 2008) | 1 line
Use correct capitalization of NaN
................
r66784 | andrew.kuchling | 2008-10-03 20:03:42 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring change: Specify exception raised
................
r66785 | andrew.kuchling | 2008-10-03 20:04:24 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring changes: Specify exceptions raised
................
r66786 | andrew.kuchling | 2008-10-03 20:05:56 -0500 (Fri, 03 Oct 2008) | 3 lines
Docstring change for *partition: use same tense as other docstrings.
Hyphenate left- and right-justified.
Fix 'registerd' typo
................
r66787 | andrew.kuchling | 2008-10-03 22:08:56 -0500 (Fri, 03 Oct 2008) | 1 line
two corrections
................
r66790 | andrew.kuchling | 2008-10-04 11:52:01 -0500 (Sat, 04 Oct 2008) | 1 line
Set svn:keywords
................
r66793 | georg.brandl | 2008-10-04 13:26:01 -0500 (Sat, 04 Oct 2008) | 2 lines
#4041: don't refer to removed and outdated modules.
................
r66797 | benjamin.peterson | 2008-10-04 15:55:50 -0500 (Sat, 04 Oct 2008) | 19 lines
Merged revisions 66707,66775,66782 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66707 | benjamin.peterson | 2008-09-30 18:27:10 -0500 (Tue, 30 Sep 2008) | 1 line
fix #4001: fix_imports didn't check for __init__.py before converting to relative imports
........
r66775 | collin.winter | 2008-10-03 12:08:26 -0500 (Fri, 03 Oct 2008) | 4 lines
Add an alternative iterative pattern matching system that, while slower, correctly parses files that cause the faster recursive pattern matcher to fail with a recursion error. lib2to3 falls back to the iterative matcher if the recursive one fails.
Fixes http://bugs.python.org/issue2532. Thanks to Nick Edds.
........
r66782 | benjamin.peterson | 2008-10-03 17:51:36 -0500 (Fri, 03 Oct 2008) | 1 line
add Victor Stinner's fixer for os.getcwdu -> os.getcwd #4023
........
................
2008-10-04 18:33:08 -03:00
|
|
|
try:
|
2007-12-09 18:39:12 -04:00
|
|
|
global PORT
|
|
|
|
PORT = serv.socket.getsockname()[1]
|
|
|
|
|
|
|
|
# Add some documentation
|
|
|
|
serv.set_server_title("DocXMLRPCServer Test Documentation")
|
|
|
|
serv.set_server_name("DocXMLRPCServer Test Docs")
|
|
|
|
serv.set_server_documentation(
|
|
|
|
"""This is an XML-RPC server's documentation, but the server can be used by
|
|
|
|
POSTing to /RPC2. Try self.add, too.""")
|
|
|
|
|
|
|
|
# Create and register classes and functions
|
|
|
|
class TestClass(object):
|
|
|
|
def test_method(self, arg):
|
|
|
|
"""Test method's docs. This method truly does very little."""
|
|
|
|
self.arg = arg
|
|
|
|
|
|
|
|
serv.register_introspection_functions()
|
|
|
|
serv.register_instance(TestClass())
|
|
|
|
|
|
|
|
def add(x, y):
|
|
|
|
"""Add two instances together. This follows PEP008, but has nothing
|
|
|
|
to do with RFC1952. Case should matter: pEp008 and rFC1952. Things
|
|
|
|
that start with http and ftp should be auto-linked, too:
|
|
|
|
http://google.com.
|
|
|
|
"""
|
|
|
|
return x + y
|
|
|
|
|
|
|
|
serv.register_function(add)
|
|
|
|
serv.register_function(lambda x, y: x-y)
|
|
|
|
|
|
|
|
while numrequests > 0:
|
|
|
|
serv.handle_request()
|
|
|
|
numrequests -= 1
|
|
|
|
except socket.timeout:
|
|
|
|
pass
|
|
|
|
finally:
|
|
|
|
serv.server_close()
|
|
|
|
PORT = None
|
|
|
|
evt.set()
|
|
|
|
|
|
|
|
class DocXMLRPCHTTPGETServer(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
|
|
# Enable server feedback
|
|
|
|
DocXMLRPCServer._send_traceback_header = True
|
|
|
|
|
|
|
|
self.evt = threading.Event()
|
|
|
|
threading.Thread(target=server, args=(self.evt, 1)).start()
|
|
|
|
|
|
|
|
# wait for port to be assigned
|
|
|
|
n = 1000
|
|
|
|
while n > 0 and PORT is None:
|
|
|
|
time.sleep(0.001)
|
|
|
|
n -= 1
|
|
|
|
|
|
|
|
self.client = httplib.HTTPConnection("localhost:%d" % PORT)
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
self.client.close()
|
|
|
|
|
|
|
|
self.evt.wait()
|
|
|
|
|
|
|
|
# Disable server feedback
|
|
|
|
DocXMLRPCServer._send_traceback_header = False
|
|
|
|
|
|
|
|
def test_valid_get_response(self):
|
|
|
|
self.client.request("GET", "/")
|
|
|
|
response = self.client.getresponse()
|
|
|
|
|
|
|
|
self.assertEqual(response.status, 200)
|
|
|
|
self.assertEqual(response.getheader("Content-type"), "text/html")
|
|
|
|
|
|
|
|
# Server throws an exception if we don't start to read the data
|
|
|
|
response.read()
|
|
|
|
|
|
|
|
def test_invalid_get_response(self):
|
|
|
|
self.client.request("GET", "/spam")
|
|
|
|
response = self.client.getresponse()
|
|
|
|
|
|
|
|
self.assertEqual(response.status, 404)
|
|
|
|
self.assertEqual(response.getheader("Content-type"), "text/plain")
|
|
|
|
|
|
|
|
response.read()
|
|
|
|
|
|
|
|
def test_lambda(self):
|
|
|
|
"""Test that lambda functionality stays the same. The output produced
|
|
|
|
currently is, I suspect invalid because of the unencoded brackets in the
|
|
|
|
HTML, "<lambda>".
|
|
|
|
|
|
|
|
The subtraction lambda method is tested.
|
|
|
|
"""
|
|
|
|
self.client.request("GET", "/")
|
|
|
|
response = self.client.getresponse()
|
|
|
|
|
|
|
|
self.assert_(
|
|
|
|
"""<dl><dt><a name="-<lambda>"><strong><lambda></strong></a>(x, y)</dt></dl>"""
|
|
|
|
in response.read())
|
|
|
|
|
|
|
|
def test_autolinking(self):
|
|
|
|
"""Test that the server correctly automatically wraps references to PEPS
|
|
|
|
and RFCs with links, and that it linkifies text starting with http or
|
|
|
|
ftp protocol prefixes.
|
|
|
|
|
|
|
|
The documentation for the "add" method contains the test material.
|
|
|
|
"""
|
|
|
|
self.client.request("GET", "/")
|
|
|
|
response = self.client.getresponse()
|
|
|
|
|
|
|
|
self.assert_( # This is ugly ... how can it be made better?
|
2008-02-07 07:43:47 -04:00
|
|
|
"""<dl><dt><a name="-add"><strong>add</strong></a>(x, y)</dt><dd><tt>Add two instances together. This follows <a href="http://www.python.org/dev/peps/pep-0008/">PEP008</a>, but has nothing<br>\nto do with <a href="http://www.rfc-editor.org/rfc/rfc1952.txt">RFC1952</a>. Case should matter: pEp008 and rFC1952. Things<br>\nthat start with http and ftp should be auto-linked, too:<br>\n<a href="http://google.com">http://google.com</a>.</tt></dd></dl>"""
|
2007-12-09 18:39:12 -04:00
|
|
|
in response.read())
|
|
|
|
|
|
|
|
def test_system_methods(self):
|
|
|
|
"""Test the precense of three consecutive system.* methods.
|
|
|
|
|
|
|
|
This also tests their use of parameter type recognition and the systems
|
|
|
|
related to that process.
|
|
|
|
"""
|
|
|
|
self.client.request("GET", "/")
|
|
|
|
response = self.client.getresponse()
|
|
|
|
|
|
|
|
self.assert_(
|
|
|
|
"""<dl><dt><a name="-system.listMethods"><strong>system.listMethods</strong></a>()</dt><dd><tt><a href="#-system.listMethods">system.listMethods</a>() => [\'add\', \'subtract\', \'multiple\']<br>\n <br>\nReturns a list of the methods supported by the server.</tt></dd></dl>\n <dl><dt><a name="-system.methodHelp"><strong>system.methodHelp</strong></a>(method_name)</dt><dd><tt><a href="#-system.methodHelp">system.methodHelp</a>(\'add\') => "Adds two integers together"<br>\n <br>\nReturns a string containing documentation for the specified method.</tt></dd></dl>\n <dl><dt><a name="-system.methodSignature"><strong>system.methodSignature</strong></a>(method_name)</dt><dd><tt><a href="#-system.methodSignature">system.methodSignature</a>(\'add\') => [double, int, int]<br>\n <br>\nReturns a list describing the signature of the method. In the<br>\nabove example, the add method takes two integers as arguments<br>\nand returns a double result.<br>\n <br>\nThis server does NOT support system.methodSignature.</tt></dd></dl>"""
|
|
|
|
in response.read())
|
|
|
|
|
|
|
|
def test_autolink_dotted_methods(self):
|
|
|
|
"""Test that selfdot values are made strong automatically in the
|
|
|
|
documentation."""
|
|
|
|
self.client.request("GET", "/")
|
|
|
|
response = self.client.getresponse()
|
|
|
|
|
|
|
|
self.assert_("""Try self.<strong>add</strong>, too.""" in
|
|
|
|
response.read())
|
|
|
|
|
|
|
|
def test_main():
|
|
|
|
test_support.run_unittest(DocXMLRPCHTTPGETServer)
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
test_main()
|