2007-07-13 07:43:44 -03:00
|
|
|
import base64
|
2005-02-10 14:33:30 -04:00
|
|
|
import datetime
|
2001-10-19 13:06:52 -03:00
|
|
|
import sys
|
2007-07-13 07:43:44 -03:00
|
|
|
import time
|
2001-10-01 14:47:44 -03:00
|
|
|
import unittest
|
|
|
|
import xmlrpclib
|
2007-08-14 10:35:00 -03:00
|
|
|
import SimpleXMLRPCServer
|
|
|
|
import threading
|
2007-08-17 16:16:44 -03:00
|
|
|
import mimetools
|
2007-12-07 05:07:10 -04:00
|
|
|
import httplib
|
|
|
|
import socket
|
Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67245 | benjamin.peterson | 2008-11-17 23:05:19 +0100 (Mon, 17 Nov 2008) | 1 line
improve __hash__ docs
........
r67277 | skip.montanaro | 2008-11-19 04:35:41 +0100 (Wed, 19 Nov 2008) | 1 line
patch from issue 1108
........
r67289 | brett.cannon | 2008-11-19 21:29:39 +0100 (Wed, 19 Nov 2008) | 2 lines
Ignore .pyc and .pyo files.
........
r67295 | benjamin.peterson | 2008-11-20 05:05:12 +0100 (Thu, 20 Nov 2008) | 1 line
move useful sys.settrace information to the function's documentation from the debugger
........
r67301 | benjamin.peterson | 2008-11-20 22:25:31 +0100 (Thu, 20 Nov 2008) | 1 line
fix indentation and a sphinx warning
........
r67302 | benjamin.peterson | 2008-11-20 22:44:23 +0100 (Thu, 20 Nov 2008) | 1 line
oops! didn't mean to disable that test
........
r67303 | benjamin.peterson | 2008-11-20 23:06:22 +0100 (Thu, 20 Nov 2008) | 1 line
backport r67300
........
r67307 | amaury.forgeotdarc | 2008-11-21 00:34:31 +0100 (Fri, 21 Nov 2008) | 9 lines
Fixed issue #4233.
Changed semantic of _fileio.FileIO's close() method on file objects with closefd=False.
The file descriptor is still kept open but the file object behaves like a closed file.
The FileIO object also got a new readonly attribute closefd.
Approved by Barry
Backport of r67106 from the py3k branch
........
r67330 | georg.brandl | 2008-11-22 09:34:14 +0100 (Sat, 22 Nov 2008) | 2 lines
#4364: fix attribute name on ctypes object.
........
r67332 | georg.brandl | 2008-11-22 09:45:33 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix typo.
........
r67336 | georg.brandl | 2008-11-22 11:08:50 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix error about "-*-" being mandatory in coding cookies.
........
r67355 | georg.brandl | 2008-11-23 20:17:25 +0100 (Sun, 23 Nov 2008) | 2 lines
#4392: fix parameter name.
........
r67359 | georg.brandl | 2008-11-23 22:57:30 +0100 (Sun, 23 Nov 2008) | 2 lines
#4399: fix typo.
........
r67362 | gregory.p.smith | 2008-11-24 01:41:43 +0100 (Mon, 24 Nov 2008) | 2 lines
Document PY_SSIZE_T_CLEAN for PyArg_ParseTuple.
........
r67364 | benjamin.peterson | 2008-11-24 02:16:29 +0100 (Mon, 24 Nov 2008) | 2 lines
replace reference to debugger-hooks
........
r67367 | georg.brandl | 2008-11-24 17:16:07 +0100 (Mon, 24 Nov 2008) | 2 lines
Fix typo.
........
r67368 | georg.brandl | 2008-11-24 20:56:47 +0100 (Mon, 24 Nov 2008) | 2 lines
#4404: make clear what "path" is.
........
r67370 | jeremy.hylton | 2008-11-24 23:00:29 +0100 (Mon, 24 Nov 2008) | 8 lines
Add unittests that verify documented behavior of public methods in Transport
class.
These methods can be overridden. The tests verify that the overridden
methods are called, and that changes to the connection have a visible
effect on the request.
........
2008-12-05 04:51:30 -04:00
|
|
|
import StringIO
|
2007-12-07 05:07:10 -04:00
|
|
|
import os
|
2002-07-23 16:04:11 -03:00
|
|
|
from test import test_support
|
2001-10-01 14:47:44 -03:00
|
|
|
|
2005-02-11 13:59:08 -04:00
|
|
|
try:
|
|
|
|
unicode
|
|
|
|
except NameError:
|
|
|
|
have_unicode = False
|
|
|
|
else:
|
|
|
|
have_unicode = True
|
|
|
|
|
2001-10-01 14:47:44 -03:00
|
|
|
alist = [{'astring': 'foo@bar.baz.spam',
|
|
|
|
'afloat': 7283.43,
|
2001-10-19 13:06:52 -03:00
|
|
|
'anint': 2**20,
|
|
|
|
'ashortlong': 2L,
|
2001-10-01 14:47:44 -03:00
|
|
|
'anotherlist': ['.zyx.41'],
|
|
|
|
'abase64': xmlrpclib.Binary("my dog has fleas"),
|
|
|
|
'boolean': xmlrpclib.False,
|
2004-06-05 09:33:27 -03:00
|
|
|
'unicode': u'\u4000\u6000\u8000',
|
|
|
|
u'ukey\u4000': 'regular value',
|
2005-02-10 14:33:30 -04:00
|
|
|
'datetime1': xmlrpclib.DateTime('20050210T11:41:23'),
|
|
|
|
'datetime2': xmlrpclib.DateTime(
|
|
|
|
(2005, 02, 10, 11, 41, 23, 0, 1, -1)),
|
|
|
|
'datetime3': xmlrpclib.DateTime(
|
|
|
|
datetime.datetime(2005, 02, 10, 11, 41, 23)),
|
2001-10-01 14:47:44 -03:00
|
|
|
}]
|
|
|
|
|
|
|
|
class XMLRPCTestCase(unittest.TestCase):
|
|
|
|
|
|
|
|
def test_dump_load(self):
|
|
|
|
self.assertEquals(alist,
|
|
|
|
xmlrpclib.loads(xmlrpclib.dumps((alist,)))[0][0])
|
|
|
|
|
2005-02-10 14:33:30 -04:00
|
|
|
def test_dump_bare_datetime(self):
|
2005-05-14 17:54:16 -03:00
|
|
|
# This checks that an unwrapped datetime.date object can be handled
|
|
|
|
# by the marshalling code. This can't be done via test_dump_load()
|
|
|
|
# since with use_datetime set to 1 the unmarshaller would create
|
|
|
|
# datetime objects for the 'datetime[123]' keys as well
|
2005-02-10 14:33:30 -04:00
|
|
|
dt = datetime.datetime(2005, 02, 10, 11, 41, 23)
|
|
|
|
s = xmlrpclib.dumps((dt,))
|
2005-05-14 17:54:16 -03:00
|
|
|
(newdt,), m = xmlrpclib.loads(s, use_datetime=1)
|
|
|
|
self.assertEquals(newdt, dt)
|
2005-02-10 14:33:30 -04:00
|
|
|
self.assertEquals(m, None)
|
|
|
|
|
2005-05-14 17:54:16 -03:00
|
|
|
(newdt,), m = xmlrpclib.loads(s, use_datetime=0)
|
|
|
|
self.assertEquals(newdt, xmlrpclib.DateTime('20050210T11:41:23'))
|
|
|
|
|
2008-04-18 17:35:46 -03:00
|
|
|
def test_datetime_before_1900(self):
|
2008-04-20 22:45:57 -03:00
|
|
|
# same as before but with a date before 1900
|
2008-04-18 17:35:46 -03:00
|
|
|
dt = datetime.datetime(1, 02, 10, 11, 41, 23)
|
|
|
|
s = xmlrpclib.dumps((dt,))
|
|
|
|
(newdt,), m = xmlrpclib.loads(s, use_datetime=1)
|
|
|
|
self.assertEquals(newdt, dt)
|
|
|
|
self.assertEquals(m, None)
|
|
|
|
|
|
|
|
(newdt,), m = xmlrpclib.loads(s, use_datetime=0)
|
|
|
|
self.assertEquals(newdt, xmlrpclib.DateTime('00010210T11:41:23'))
|
|
|
|
|
2008-02-23 12:23:05 -04:00
|
|
|
def test_cmp_datetime_DateTime(self):
|
|
|
|
now = datetime.datetime.now()
|
|
|
|
dt = xmlrpclib.DateTime(now.timetuple())
|
|
|
|
self.assert_(dt == now)
|
|
|
|
self.assert_(now == dt)
|
|
|
|
then = now + datetime.timedelta(seconds=4)
|
|
|
|
self.assert_(then >= dt)
|
|
|
|
self.assert_(dt < then)
|
2005-05-14 17:54:16 -03:00
|
|
|
|
2005-12-04 15:11:17 -04:00
|
|
|
def test_bug_1164912 (self):
|
|
|
|
d = xmlrpclib.DateTime()
|
2005-12-25 19:18:31 -04:00
|
|
|
((new_d,), dummy) = xmlrpclib.loads(xmlrpclib.dumps((d,),
|
2005-12-04 15:11:17 -04:00
|
|
|
methodresponse=True))
|
|
|
|
self.assert_(isinstance(new_d.value, str))
|
|
|
|
|
|
|
|
# Check that the output of dumps() is still an 8-bit string
|
|
|
|
s = xmlrpclib.dumps((new_d,), methodresponse=True)
|
|
|
|
self.assert_(isinstance(s, str))
|
|
|
|
|
2006-11-19 14:51:54 -04:00
|
|
|
def test_newstyle_class(self):
|
|
|
|
class T(object):
|
|
|
|
pass
|
|
|
|
t = T()
|
|
|
|
t.x = 100
|
|
|
|
t.y = "Hello"
|
|
|
|
((t2,), dummy) = xmlrpclib.loads(xmlrpclib.dumps((t,)))
|
|
|
|
self.assertEquals(t2, t.__dict__)
|
|
|
|
|
2001-10-19 13:06:52 -03:00
|
|
|
def test_dump_big_long(self):
|
|
|
|
self.assertRaises(OverflowError, xmlrpclib.dumps, (2L**99,))
|
|
|
|
|
|
|
|
def test_dump_bad_dict(self):
|
|
|
|
self.assertRaises(TypeError, xmlrpclib.dumps, ({(1,2,3): 1},))
|
|
|
|
|
2007-07-13 07:43:44 -03:00
|
|
|
def test_dump_recursive_seq(self):
|
|
|
|
l = [1,2,3]
|
|
|
|
t = [3,4,5,l]
|
|
|
|
l.append(t)
|
|
|
|
self.assertRaises(TypeError, xmlrpclib.dumps, (l,))
|
|
|
|
|
|
|
|
def test_dump_recursive_dict(self):
|
|
|
|
d = {'1':1, '2':1}
|
|
|
|
t = {'3':3, 'd':d}
|
|
|
|
d['t'] = t
|
|
|
|
self.assertRaises(TypeError, xmlrpclib.dumps, (d,))
|
|
|
|
|
2001-10-19 13:06:52 -03:00
|
|
|
def test_dump_big_int(self):
|
|
|
|
if sys.maxint > 2L**31-1:
|
|
|
|
self.assertRaises(OverflowError, xmlrpclib.dumps,
|
|
|
|
(int(2L**34),))
|
|
|
|
|
2007-07-13 07:43:44 -03:00
|
|
|
xmlrpclib.dumps((xmlrpclib.MAXINT, xmlrpclib.MININT))
|
|
|
|
self.assertRaises(OverflowError, xmlrpclib.dumps, (xmlrpclib.MAXINT+1,))
|
|
|
|
self.assertRaises(OverflowError, xmlrpclib.dumps, (xmlrpclib.MININT-1,))
|
|
|
|
|
|
|
|
def dummy_write(s):
|
|
|
|
pass
|
|
|
|
|
|
|
|
m = xmlrpclib.Marshaller()
|
|
|
|
m.dump_int(xmlrpclib.MAXINT, dummy_write)
|
|
|
|
m.dump_int(xmlrpclib.MININT, dummy_write)
|
|
|
|
self.assertRaises(OverflowError, m.dump_int, xmlrpclib.MAXINT+1, dummy_write)
|
|
|
|
self.assertRaises(OverflowError, m.dump_int, xmlrpclib.MININT-1, dummy_write)
|
|
|
|
|
|
|
|
|
2003-04-24 21:27:24 -03:00
|
|
|
def test_dump_none(self):
|
|
|
|
value = alist + [None]
|
|
|
|
arg1 = (alist + [None],)
|
|
|
|
strg = xmlrpclib.dumps(arg1, allow_none=True)
|
|
|
|
self.assertEquals(value,
|
|
|
|
xmlrpclib.loads(strg)[0][0])
|
|
|
|
self.assertRaises(TypeError, xmlrpclib.dumps, (arg1,))
|
|
|
|
|
2005-02-11 13:59:08 -04:00
|
|
|
def test_default_encoding_issues(self):
|
|
|
|
# SF bug #1115989: wrong decoding in '_stringify'
|
|
|
|
utf8 = """<?xml version='1.0' encoding='iso-8859-1'?>
|
|
|
|
<params>
|
|
|
|
<param><value>
|
|
|
|
<string>abc \x95</string>
|
|
|
|
</value></param>
|
|
|
|
<param><value>
|
|
|
|
<struct>
|
|
|
|
<member>
|
|
|
|
<name>def \x96</name>
|
|
|
|
<value><string>ghi \x97</string></value>
|
|
|
|
</member>
|
|
|
|
</struct>
|
|
|
|
</value></param>
|
|
|
|
</params>
|
|
|
|
"""
|
2005-04-08 15:00:59 -03:00
|
|
|
|
|
|
|
# sys.setdefaultencoding() normally doesn't exist after site.py is
|
|
|
|
# loaded. reload(sys) is the way to get it back.
|
2005-02-11 13:59:08 -04:00
|
|
|
old_encoding = sys.getdefaultencoding()
|
2005-04-08 15:00:59 -03:00
|
|
|
setdefaultencoding_existed = hasattr(sys, "setdefaultencoding")
|
2005-02-11 13:59:08 -04:00
|
|
|
reload(sys) # ugh!
|
|
|
|
sys.setdefaultencoding("iso-8859-1")
|
|
|
|
try:
|
|
|
|
(s, d), m = xmlrpclib.loads(utf8)
|
|
|
|
finally:
|
|
|
|
sys.setdefaultencoding(old_encoding)
|
2005-04-08 15:00:59 -03:00
|
|
|
if not setdefaultencoding_existed:
|
|
|
|
del sys.setdefaultencoding
|
|
|
|
|
2005-02-11 13:59:08 -04:00
|
|
|
items = d.items()
|
|
|
|
if have_unicode:
|
|
|
|
self.assertEquals(s, u"abc \x95")
|
|
|
|
self.assert_(isinstance(s, unicode))
|
|
|
|
self.assertEquals(items, [(u"def \x96", u"ghi \x97")])
|
|
|
|
self.assert_(isinstance(items[0][0], unicode))
|
|
|
|
self.assert_(isinstance(items[0][1], unicode))
|
|
|
|
else:
|
|
|
|
self.assertEquals(s, "abc \xc2\x95")
|
|
|
|
self.assertEquals(items, [("def \xc2\x96", "ghi \xc2\x97")])
|
|
|
|
|
2007-07-13 07:43:44 -03:00
|
|
|
|
|
|
|
class HelperTestCase(unittest.TestCase):
|
|
|
|
def test_escape(self):
|
|
|
|
self.assertEqual(xmlrpclib.escape("a&b"), "a&b")
|
|
|
|
self.assertEqual(xmlrpclib.escape("a<b"), "a<b")
|
|
|
|
self.assertEqual(xmlrpclib.escape("a>b"), "a>b")
|
|
|
|
|
|
|
|
class FaultTestCase(unittest.TestCase):
|
|
|
|
def test_repr(self):
|
|
|
|
f = xmlrpclib.Fault(42, 'Test Fault')
|
|
|
|
self.assertEqual(repr(f), "<Fault 42: 'Test Fault'>")
|
|
|
|
self.assertEqual(repr(f), str(f))
|
|
|
|
|
|
|
|
def test_dump_fault(self):
|
|
|
|
f = xmlrpclib.Fault(42, 'Test Fault')
|
|
|
|
s = xmlrpclib.dumps((f,))
|
|
|
|
(newf,), m = xmlrpclib.loads(s)
|
|
|
|
self.assertEquals(newf, {'faultCode': 42, 'faultString': 'Test Fault'})
|
|
|
|
self.assertEquals(m, None)
|
|
|
|
|
|
|
|
s = xmlrpclib.Marshaller().dumps(f)
|
|
|
|
self.assertRaises(xmlrpclib.Fault, xmlrpclib.loads, s)
|
|
|
|
|
|
|
|
|
|
|
|
class DateTimeTestCase(unittest.TestCase):
|
|
|
|
def test_default(self):
|
|
|
|
t = xmlrpclib.DateTime()
|
|
|
|
|
|
|
|
def test_time(self):
|
|
|
|
d = 1181399930.036952
|
|
|
|
t = xmlrpclib.DateTime(d)
|
|
|
|
self.assertEqual(str(t), time.strftime("%Y%m%dT%H:%M:%S", time.localtime(d)))
|
|
|
|
|
|
|
|
def test_time_tuple(self):
|
|
|
|
d = (2007,6,9,10,38,50,5,160,0)
|
|
|
|
t = xmlrpclib.DateTime(d)
|
|
|
|
self.assertEqual(str(t), '20070609T10:38:50')
|
|
|
|
|
|
|
|
def test_time_struct(self):
|
|
|
|
d = time.localtime(1181399930.036952)
|
|
|
|
t = xmlrpclib.DateTime(d)
|
|
|
|
self.assertEqual(str(t), time.strftime("%Y%m%dT%H:%M:%S", d))
|
|
|
|
|
|
|
|
def test_datetime_datetime(self):
|
|
|
|
d = datetime.datetime(2007,1,2,3,4,5)
|
|
|
|
t = xmlrpclib.DateTime(d)
|
|
|
|
self.assertEqual(str(t), '20070102T03:04:05')
|
|
|
|
|
|
|
|
def test_repr(self):
|
|
|
|
d = datetime.datetime(2007,1,2,3,4,5)
|
|
|
|
t = xmlrpclib.DateTime(d)
|
|
|
|
val ="<DateTime '20070102T03:04:05' at %x>" % id(t)
|
|
|
|
self.assertEqual(repr(t), val)
|
|
|
|
|
|
|
|
def test_decode(self):
|
|
|
|
d = ' 20070908T07:11:13 '
|
|
|
|
t1 = xmlrpclib.DateTime()
|
|
|
|
t1.decode(d)
|
|
|
|
tref = xmlrpclib.DateTime(datetime.datetime(2007,9,8,7,11,13))
|
|
|
|
self.assertEqual(t1, tref)
|
|
|
|
|
|
|
|
t2 = xmlrpclib._datetime(d)
|
|
|
|
self.assertEqual(t1, tref)
|
|
|
|
|
|
|
|
class BinaryTestCase(unittest.TestCase):
|
|
|
|
def test_default(self):
|
|
|
|
t = xmlrpclib.Binary()
|
|
|
|
self.assertEqual(str(t), '')
|
|
|
|
|
|
|
|
def test_string(self):
|
|
|
|
d = '\x01\x02\x03abc123\xff\xfe'
|
|
|
|
t = xmlrpclib.Binary(d)
|
|
|
|
self.assertEqual(str(t), d)
|
|
|
|
|
|
|
|
def test_decode(self):
|
|
|
|
d = '\x01\x02\x03abc123\xff\xfe'
|
|
|
|
de = base64.encodestring(d)
|
|
|
|
t1 = xmlrpclib.Binary()
|
|
|
|
t1.decode(de)
|
|
|
|
self.assertEqual(str(t1), d)
|
|
|
|
|
|
|
|
t2 = xmlrpclib._binary(de)
|
|
|
|
self.assertEqual(str(t2), d)
|
|
|
|
|
|
|
|
|
2007-08-14 10:35:00 -03:00
|
|
|
PORT = None
|
|
|
|
|
2008-01-26 03:26:12 -04:00
|
|
|
# The evt is set twice. First when the server is ready to serve.
|
|
|
|
# Second when the server has been shutdown. The user must clear
|
|
|
|
# the event after it has been set the first time to catch the second set.
|
2007-08-14 10:35:00 -03:00
|
|
|
def http_server(evt, numrequests):
|
|
|
|
class TestInstanceClass:
|
|
|
|
def div(self, x, y):
|
|
|
|
return x // y
|
|
|
|
|
2007-12-07 05:07:10 -04:00
|
|
|
def _methodHelp(self, name):
|
|
|
|
if name == 'div':
|
|
|
|
return 'This is the div function'
|
|
|
|
|
|
|
|
def my_function():
|
|
|
|
'''This is my function'''
|
|
|
|
return True
|
|
|
|
|
2008-03-28 03:34:03 -03:00
|
|
|
class MyXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
|
|
|
|
def get_request(self):
|
|
|
|
# Ensure the socket is always non-blocking. On Linux, socket
|
|
|
|
# attributes are not inherited like they are on *BSD and Windows.
|
|
|
|
s, port = self.socket.accept()
|
|
|
|
s.setblocking(True)
|
|
|
|
return s, port
|
|
|
|
|
2007-08-14 10:35:00 -03:00
|
|
|
try:
|
2008-03-28 03:34:03 -03:00
|
|
|
serv = MyXMLRPCServer(("localhost", 0),
|
|
|
|
logRequests=False, bind_and_activate=False)
|
2007-08-14 10:35:00 -03:00
|
|
|
serv.socket.settimeout(3)
|
|
|
|
serv.server_bind()
|
|
|
|
global PORT
|
|
|
|
PORT = serv.socket.getsockname()[1]
|
|
|
|
serv.server_activate()
|
|
|
|
serv.register_introspection_functions()
|
|
|
|
serv.register_multicall_functions()
|
|
|
|
serv.register_function(pow)
|
|
|
|
serv.register_function(lambda x,y: x+y, 'add')
|
2007-12-07 05:07:10 -04:00
|
|
|
serv.register_function(my_function)
|
2007-08-14 10:35:00 -03:00
|
|
|
serv.register_instance(TestInstanceClass())
|
2008-01-26 03:26:12 -04:00
|
|
|
evt.set()
|
2007-08-14 10:35:00 -03:00
|
|
|
|
|
|
|
# handle up to 'numrequests' requests
|
|
|
|
while numrequests > 0:
|
|
|
|
serv.handle_request()
|
|
|
|
numrequests -= 1
|
|
|
|
|
|
|
|
except socket.timeout:
|
|
|
|
pass
|
|
|
|
finally:
|
|
|
|
serv.socket.close()
|
|
|
|
PORT = None
|
|
|
|
evt.set()
|
|
|
|
|
2008-01-26 04:26:00 -04:00
|
|
|
# This function prevents errors like:
|
|
|
|
# <ProtocolError for localhost:57527/RPC2: 500 Internal Server Error>
|
2007-08-26 22:15:34 -03:00
|
|
|
def is_unavailable_exception(e):
|
|
|
|
'''Returns True if the given ProtocolError is the product of a server-side
|
|
|
|
exception caused by the 'temporarily unavailable' response sometimes
|
|
|
|
given by operations on non-blocking sockets.'''
|
2008-01-26 03:26:12 -04:00
|
|
|
|
2007-08-26 22:15:34 -03:00
|
|
|
# sometimes we get a -1 error code and/or empty headers
|
2008-01-27 14:19:04 -04:00
|
|
|
try:
|
|
|
|
if e.errcode == -1 or e.headers is None:
|
|
|
|
return True
|
|
|
|
exc_mess = e.headers.get('X-exception')
|
|
|
|
except AttributeError:
|
|
|
|
# Ignore socket.errors here.
|
|
|
|
exc_mess = str(e)
|
2007-08-26 22:15:34 -03:00
|
|
|
|
|
|
|
if exc_mess and 'temporarily unavailable' in exc_mess.lower():
|
|
|
|
return True
|
|
|
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
# NOTE: The tests in SimpleServerTestCase will ignore failures caused by
|
|
|
|
# "temporarily unavailable" exceptions raised in SimpleXMLRPCServer. This
|
|
|
|
# condition occurs infrequently on some platforms, frequently on others, and
|
|
|
|
# is apparently caused by using SimpleXMLRPCServer with a non-blocking socket.
|
|
|
|
# If the server class is updated at some point in the future to handle this
|
|
|
|
# situation more gracefully, these tests should be modified appropriately.
|
|
|
|
|
2007-08-17 16:16:44 -03:00
|
|
|
class SimpleServerTestCase(unittest.TestCase):
|
2007-08-14 10:35:00 -03:00
|
|
|
def setUp(self):
|
2007-08-17 16:16:44 -03:00
|
|
|
# enable traceback reporting
|
|
|
|
SimpleXMLRPCServer.SimpleXMLRPCServer._send_traceback_header = True
|
|
|
|
|
2007-08-14 10:35:00 -03:00
|
|
|
self.evt = threading.Event()
|
2007-08-17 16:16:44 -03:00
|
|
|
# start server thread to handle requests
|
2007-08-26 22:15:34 -03:00
|
|
|
serv_args = (self.evt, 1)
|
2007-08-17 16:16:44 -03:00
|
|
|
threading.Thread(target=http_server, args=serv_args).start()
|
2007-08-14 10:35:00 -03:00
|
|
|
|
2008-01-26 03:26:12 -04:00
|
|
|
# wait for the server to be ready
|
|
|
|
self.evt.wait()
|
|
|
|
self.evt.clear()
|
2007-08-14 10:35:00 -03:00
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
# wait on the server thread to terminate
|
|
|
|
self.evt.wait()
|
|
|
|
|
2007-08-17 16:16:44 -03:00
|
|
|
# disable traceback reporting
|
|
|
|
SimpleXMLRPCServer.SimpleXMLRPCServer._send_traceback_header = False
|
|
|
|
|
2007-08-14 10:35:00 -03:00
|
|
|
def test_simple1(self):
|
2007-08-20 21:16:21 -03:00
|
|
|
try:
|
|
|
|
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
|
|
|
|
self.assertEqual(p.pow(6,8), 6**8)
|
2008-01-27 13:11:11 -04:00
|
|
|
except (xmlrpclib.ProtocolError, socket.error), e:
|
2007-08-26 22:15:34 -03:00
|
|
|
# ignore failures due to non-blocking socket 'unavailable' errors
|
|
|
|
if not is_unavailable_exception(e):
|
|
|
|
# protocol error; provide additional information in test output
|
2008-01-27 16:03:13 -04:00
|
|
|
self.fail("%s\n%s" % (e, getattr(e, "headers", "")))
|
2007-08-14 10:35:00 -03:00
|
|
|
|
2008-01-19 12:39:27 -04:00
|
|
|
# [ch] The test 404 is causing lots of false alarms.
|
|
|
|
def XXXtest_404(self):
|
2007-12-07 05:07:10 -04:00
|
|
|
# send POST with httplib, it should return 404 header and
|
|
|
|
# 'Not Found' message.
|
|
|
|
conn = httplib.HTTPConnection('localhost', PORT)
|
|
|
|
conn.request('POST', '/this-is-not-valid')
|
|
|
|
response = conn.getresponse()
|
|
|
|
conn.close()
|
|
|
|
|
|
|
|
self.assertEqual(response.status, 404)
|
|
|
|
self.assertEqual(response.reason, 'Not Found')
|
|
|
|
|
2007-08-14 10:35:00 -03:00
|
|
|
def test_introspection1(self):
|
2007-08-20 21:16:21 -03:00
|
|
|
try:
|
|
|
|
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
|
|
|
|
meth = p.system.listMethods()
|
2007-12-07 05:07:10 -04:00
|
|
|
expected_methods = set(['pow', 'div', 'my_function', 'add',
|
|
|
|
'system.listMethods', 'system.methodHelp',
|
|
|
|
'system.methodSignature', 'system.multicall'])
|
2007-08-20 21:16:21 -03:00
|
|
|
self.assertEqual(set(meth), expected_methods)
|
2008-01-27 13:11:11 -04:00
|
|
|
except (xmlrpclib.ProtocolError, socket.error), e:
|
2007-08-26 22:15:34 -03:00
|
|
|
# ignore failures due to non-blocking socket 'unavailable' errors
|
|
|
|
if not is_unavailable_exception(e):
|
|
|
|
# protocol error; provide additional information in test output
|
2008-01-27 16:03:13 -04:00
|
|
|
self.fail("%s\n%s" % (e, getattr(e, "headers", "")))
|
2007-08-14 10:35:00 -03:00
|
|
|
|
|
|
|
def test_introspection2(self):
|
2007-08-20 21:16:21 -03:00
|
|
|
try:
|
2007-12-07 05:07:10 -04:00
|
|
|
# test _methodHelp()
|
2007-08-20 21:16:21 -03:00
|
|
|
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
|
|
|
|
divhelp = p.system.methodHelp('div')
|
|
|
|
self.assertEqual(divhelp, 'This is the div function')
|
2008-01-27 13:11:11 -04:00
|
|
|
except (xmlrpclib.ProtocolError, socket.error), e:
|
2007-08-26 22:15:34 -03:00
|
|
|
# ignore failures due to non-blocking socket 'unavailable' errors
|
|
|
|
if not is_unavailable_exception(e):
|
|
|
|
# protocol error; provide additional information in test output
|
2008-01-27 16:03:13 -04:00
|
|
|
self.fail("%s\n%s" % (e, getattr(e, "headers", "")))
|
2007-08-14 10:35:00 -03:00
|
|
|
|
|
|
|
def test_introspection3(self):
|
2007-12-07 05:07:10 -04:00
|
|
|
try:
|
|
|
|
# test native doc
|
|
|
|
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
|
|
|
|
myfunction = p.system.methodHelp('my_function')
|
|
|
|
self.assertEqual(myfunction, 'This is my function')
|
2008-01-27 13:11:11 -04:00
|
|
|
except (xmlrpclib.ProtocolError, socket.error), e:
|
2007-12-07 05:07:10 -04:00
|
|
|
# ignore failures due to non-blocking socket 'unavailable' errors
|
|
|
|
if not is_unavailable_exception(e):
|
|
|
|
# protocol error; provide additional information in test output
|
2008-01-27 16:03:13 -04:00
|
|
|
self.fail("%s\n%s" % (e, getattr(e, "headers", "")))
|
2007-12-07 05:07:10 -04:00
|
|
|
|
|
|
|
def test_introspection4(self):
|
2007-08-14 10:35:00 -03:00
|
|
|
# the SimpleXMLRPCServer doesn't support signatures, but
|
2007-08-26 22:15:34 -03:00
|
|
|
# at least check that we can try making the call
|
2007-08-20 21:16:21 -03:00
|
|
|
try:
|
|
|
|
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
|
|
|
|
divsig = p.system.methodSignature('div')
|
|
|
|
self.assertEqual(divsig, 'signatures not supported')
|
2008-01-27 13:11:11 -04:00
|
|
|
except (xmlrpclib.ProtocolError, socket.error), e:
|
2007-08-26 22:15:34 -03:00
|
|
|
# ignore failures due to non-blocking socket 'unavailable' errors
|
|
|
|
if not is_unavailable_exception(e):
|
|
|
|
# protocol error; provide additional information in test output
|
2008-01-27 16:03:13 -04:00
|
|
|
self.fail("%s\n%s" % (e, getattr(e, "headers", "")))
|
2007-08-14 10:35:00 -03:00
|
|
|
|
|
|
|
def test_multicall(self):
|
2007-08-20 21:16:21 -03:00
|
|
|
try:
|
|
|
|
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
|
|
|
|
multicall = xmlrpclib.MultiCall(p)
|
|
|
|
multicall.add(2,3)
|
|
|
|
multicall.pow(6,8)
|
|
|
|
multicall.div(127,42)
|
|
|
|
add_result, pow_result, div_result = multicall()
|
|
|
|
self.assertEqual(add_result, 2+3)
|
|
|
|
self.assertEqual(pow_result, 6**8)
|
|
|
|
self.assertEqual(div_result, 127//42)
|
2008-01-27 13:11:11 -04:00
|
|
|
except (xmlrpclib.ProtocolError, socket.error), e:
|
2007-08-26 22:15:34 -03:00
|
|
|
# ignore failures due to non-blocking socket 'unavailable' errors
|
|
|
|
if not is_unavailable_exception(e):
|
|
|
|
# protocol error; provide additional information in test output
|
2008-01-27 16:03:13 -04:00
|
|
|
self.fail("%s\n%s" % (e, getattr(e, "headers", "")))
|
2007-08-14 10:35:00 -03:00
|
|
|
|
2007-12-07 05:07:10 -04:00
|
|
|
def test_non_existing_multicall(self):
|
|
|
|
try:
|
|
|
|
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
|
|
|
|
multicall = xmlrpclib.MultiCall(p)
|
|
|
|
multicall.this_is_not_exists()
|
|
|
|
result = multicall()
|
|
|
|
|
|
|
|
# result.results contains;
|
|
|
|
# [{'faultCode': 1, 'faultString': '<type \'exceptions.Exception\'>:'
|
|
|
|
# 'method "this_is_not_exists" is not supported'>}]
|
|
|
|
|
|
|
|
self.assertEqual(result.results[0]['faultCode'], 1)
|
|
|
|
self.assertEqual(result.results[0]['faultString'],
|
|
|
|
'<type \'exceptions.Exception\'>:method "this_is_not_exists" '
|
|
|
|
'is not supported')
|
2008-01-27 13:11:11 -04:00
|
|
|
except (xmlrpclib.ProtocolError, socket.error), e:
|
2007-12-07 05:07:10 -04:00
|
|
|
# ignore failures due to non-blocking socket 'unavailable' errors
|
|
|
|
if not is_unavailable_exception(e):
|
|
|
|
# protocol error; provide additional information in test output
|
2008-01-27 16:03:13 -04:00
|
|
|
self.fail("%s\n%s" % (e, getattr(e, "headers", "")))
|
2007-12-07 05:07:10 -04:00
|
|
|
|
|
|
|
def test_dotted_attribute(self):
|
2008-03-23 01:08:30 -03:00
|
|
|
# Raises an AttributeError because private methods are not allowed.
|
2007-12-07 05:07:10 -04:00
|
|
|
self.assertRaises(AttributeError,
|
|
|
|
SimpleXMLRPCServer.resolve_dotted_attribute, str, '__add')
|
|
|
|
|
|
|
|
self.assert_(SimpleXMLRPCServer.resolve_dotted_attribute(str, 'title'))
|
2008-03-23 01:08:30 -03:00
|
|
|
# Get the test to run faster by sending a request with test_simple1.
|
|
|
|
# This avoids waiting for the socket timeout.
|
|
|
|
self.test_simple1()
|
2007-08-14 10:35:00 -03:00
|
|
|
|
2007-08-17 16:16:44 -03:00
|
|
|
# This is a contrived way to make a failure occur on the server side
|
|
|
|
# in order to test the _send_traceback_header flag on the server
|
|
|
|
class FailingMessageClass(mimetools.Message):
|
|
|
|
def __getitem__(self, key):
|
|
|
|
key = key.lower()
|
|
|
|
if key == 'content-length':
|
|
|
|
return 'I am broken'
|
|
|
|
return mimetools.Message.__getitem__(self, key)
|
|
|
|
|
|
|
|
|
|
|
|
class FailingServerTestCase(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
|
|
self.evt = threading.Event()
|
|
|
|
# start server thread to handle requests
|
2008-03-23 01:08:30 -03:00
|
|
|
serv_args = (self.evt, 1)
|
2007-08-17 16:16:44 -03:00
|
|
|
threading.Thread(target=http_server, args=serv_args).start()
|
|
|
|
|
2008-01-26 03:26:12 -04:00
|
|
|
# wait for the server to be ready
|
|
|
|
self.evt.wait()
|
|
|
|
self.evt.clear()
|
2007-08-17 16:16:44 -03:00
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
# wait on the server thread to terminate
|
|
|
|
self.evt.wait()
|
|
|
|
# reset flag
|
|
|
|
SimpleXMLRPCServer.SimpleXMLRPCServer._send_traceback_header = False
|
|
|
|
# reset message class
|
|
|
|
SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.MessageClass = mimetools.Message
|
|
|
|
|
|
|
|
def test_basic(self):
|
|
|
|
# check that flag is false by default
|
|
|
|
flagval = SimpleXMLRPCServer.SimpleXMLRPCServer._send_traceback_header
|
|
|
|
self.assertEqual(flagval, False)
|
|
|
|
|
2007-08-20 21:16:21 -03:00
|
|
|
# enable traceback reporting
|
|
|
|
SimpleXMLRPCServer.SimpleXMLRPCServer._send_traceback_header = True
|
|
|
|
|
|
|
|
# test a call that shouldn't fail just as a smoke test
|
|
|
|
try:
|
|
|
|
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
|
|
|
|
self.assertEqual(p.pow(6,8), 6**8)
|
2008-01-27 13:11:11 -04:00
|
|
|
except (xmlrpclib.ProtocolError, socket.error), e:
|
2007-08-29 07:28:28 -03:00
|
|
|
# ignore failures due to non-blocking socket 'unavailable' errors
|
|
|
|
if not is_unavailable_exception(e):
|
|
|
|
# protocol error; provide additional information in test output
|
2008-01-27 16:03:13 -04:00
|
|
|
self.fail("%s\n%s" % (e, getattr(e, "headers", "")))
|
2007-08-17 16:16:44 -03:00
|
|
|
|
|
|
|
def test_fail_no_info(self):
|
|
|
|
# use the broken message class
|
|
|
|
SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.MessageClass = FailingMessageClass
|
|
|
|
|
|
|
|
try:
|
|
|
|
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
|
|
|
|
p.pow(6,8)
|
2008-01-27 13:11:11 -04:00
|
|
|
except (xmlrpclib.ProtocolError, socket.error), e:
|
2007-08-29 07:28:28 -03:00
|
|
|
# ignore failures due to non-blocking socket 'unavailable' errors
|
2008-01-27 16:03:13 -04:00
|
|
|
if not is_unavailable_exception(e) and hasattr(e, "headers"):
|
2007-08-29 07:28:28 -03:00
|
|
|
# The two server-side error headers shouldn't be sent back in this case
|
|
|
|
self.assertTrue(e.headers.get("X-exception") is None)
|
|
|
|
self.assertTrue(e.headers.get("X-traceback") is None)
|
2007-08-17 16:16:44 -03:00
|
|
|
else:
|
|
|
|
self.fail('ProtocolError not raised')
|
|
|
|
|
|
|
|
def test_fail_with_info(self):
|
|
|
|
# use the broken message class
|
|
|
|
SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.MessageClass = FailingMessageClass
|
|
|
|
|
|
|
|
# Check that errors in the server send back exception/traceback
|
|
|
|
# info when flag is set
|
|
|
|
SimpleXMLRPCServer.SimpleXMLRPCServer._send_traceback_header = True
|
|
|
|
|
|
|
|
try:
|
|
|
|
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
|
|
|
|
p.pow(6,8)
|
2008-01-27 13:11:11 -04:00
|
|
|
except (xmlrpclib.ProtocolError, socket.error), e:
|
2007-08-29 07:28:28 -03:00
|
|
|
# ignore failures due to non-blocking socket 'unavailable' errors
|
2008-01-27 16:03:13 -04:00
|
|
|
if not is_unavailable_exception(e) and hasattr(e, "headers"):
|
2007-08-29 07:28:28 -03:00
|
|
|
# We should get error info in the response
|
|
|
|
expected_err = "invalid literal for int() with base 10: 'I am broken'"
|
|
|
|
self.assertEqual(e.headers.get("x-exception"), expected_err)
|
|
|
|
self.assertTrue(e.headers.get("x-traceback") is not None)
|
2007-08-17 16:16:44 -03:00
|
|
|
else:
|
|
|
|
self.fail('ProtocolError not raised')
|
|
|
|
|
2007-12-07 05:07:10 -04:00
|
|
|
class CGIHandlerTestCase(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
|
|
self.cgi = SimpleXMLRPCServer.CGIXMLRPCRequestHandler()
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
self.cgi = None
|
|
|
|
|
|
|
|
def test_cgi_get(self):
|
|
|
|
os.environ['REQUEST_METHOD'] = 'GET'
|
|
|
|
# if the method is GET and no request_text is given, it runs handle_get
|
|
|
|
# get sysout output
|
|
|
|
tmp = sys.stdout
|
|
|
|
sys.stdout = open(test_support.TESTFN, "w")
|
|
|
|
self.cgi.handle_request()
|
|
|
|
sys.stdout.close()
|
|
|
|
sys.stdout = tmp
|
|
|
|
|
|
|
|
# parse Status header
|
|
|
|
handle = open(test_support.TESTFN, "r").read()
|
|
|
|
status = handle.split()[1]
|
|
|
|
message = ' '.join(handle.split()[2:4])
|
|
|
|
|
|
|
|
self.assertEqual(status, '400')
|
|
|
|
self.assertEqual(message, 'Bad Request')
|
|
|
|
|
|
|
|
os.remove(test_support.TESTFN)
|
|
|
|
os.environ['REQUEST_METHOD'] = ''
|
|
|
|
|
|
|
|
def test_cgi_xmlrpc_response(self):
|
|
|
|
data = """<?xml version='1.0'?>
|
|
|
|
<methodCall>
|
|
|
|
<methodName>test_method</methodName>
|
|
|
|
<params>
|
|
|
|
<param>
|
|
|
|
<value><string>foo</string></value>
|
|
|
|
</param>
|
|
|
|
<param>
|
|
|
|
<value><string>bar</string></value>
|
|
|
|
</param>
|
|
|
|
</params>
|
|
|
|
</methodCall>
|
|
|
|
"""
|
|
|
|
open("xmldata.txt", "w").write(data)
|
|
|
|
tmp1 = sys.stdin
|
|
|
|
tmp2 = sys.stdout
|
|
|
|
|
|
|
|
sys.stdin = open("xmldata.txt", "r")
|
|
|
|
sys.stdout = open(test_support.TESTFN, "w")
|
|
|
|
|
|
|
|
self.cgi.handle_request()
|
|
|
|
|
|
|
|
sys.stdin.close()
|
|
|
|
sys.stdout.close()
|
|
|
|
sys.stdin = tmp1
|
|
|
|
sys.stdout = tmp2
|
|
|
|
|
|
|
|
# will respond exception, if so, our goal is achieved ;)
|
|
|
|
handle = open(test_support.TESTFN, "r").read()
|
|
|
|
|
|
|
|
# start with 44th char so as not to get http header, we just need only xml
|
|
|
|
self.assertRaises(xmlrpclib.Fault, xmlrpclib.loads, handle[44:])
|
|
|
|
|
|
|
|
os.remove("xmldata.txt")
|
|
|
|
os.remove(test_support.TESTFN)
|
2007-08-17 16:16:44 -03:00
|
|
|
|
Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67245 | benjamin.peterson | 2008-11-17 23:05:19 +0100 (Mon, 17 Nov 2008) | 1 line
improve __hash__ docs
........
r67277 | skip.montanaro | 2008-11-19 04:35:41 +0100 (Wed, 19 Nov 2008) | 1 line
patch from issue 1108
........
r67289 | brett.cannon | 2008-11-19 21:29:39 +0100 (Wed, 19 Nov 2008) | 2 lines
Ignore .pyc and .pyo files.
........
r67295 | benjamin.peterson | 2008-11-20 05:05:12 +0100 (Thu, 20 Nov 2008) | 1 line
move useful sys.settrace information to the function's documentation from the debugger
........
r67301 | benjamin.peterson | 2008-11-20 22:25:31 +0100 (Thu, 20 Nov 2008) | 1 line
fix indentation and a sphinx warning
........
r67302 | benjamin.peterson | 2008-11-20 22:44:23 +0100 (Thu, 20 Nov 2008) | 1 line
oops! didn't mean to disable that test
........
r67303 | benjamin.peterson | 2008-11-20 23:06:22 +0100 (Thu, 20 Nov 2008) | 1 line
backport r67300
........
r67307 | amaury.forgeotdarc | 2008-11-21 00:34:31 +0100 (Fri, 21 Nov 2008) | 9 lines
Fixed issue #4233.
Changed semantic of _fileio.FileIO's close() method on file objects with closefd=False.
The file descriptor is still kept open but the file object behaves like a closed file.
The FileIO object also got a new readonly attribute closefd.
Approved by Barry
Backport of r67106 from the py3k branch
........
r67330 | georg.brandl | 2008-11-22 09:34:14 +0100 (Sat, 22 Nov 2008) | 2 lines
#4364: fix attribute name on ctypes object.
........
r67332 | georg.brandl | 2008-11-22 09:45:33 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix typo.
........
r67336 | georg.brandl | 2008-11-22 11:08:50 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix error about "-*-" being mandatory in coding cookies.
........
r67355 | georg.brandl | 2008-11-23 20:17:25 +0100 (Sun, 23 Nov 2008) | 2 lines
#4392: fix parameter name.
........
r67359 | georg.brandl | 2008-11-23 22:57:30 +0100 (Sun, 23 Nov 2008) | 2 lines
#4399: fix typo.
........
r67362 | gregory.p.smith | 2008-11-24 01:41:43 +0100 (Mon, 24 Nov 2008) | 2 lines
Document PY_SSIZE_T_CLEAN for PyArg_ParseTuple.
........
r67364 | benjamin.peterson | 2008-11-24 02:16:29 +0100 (Mon, 24 Nov 2008) | 2 lines
replace reference to debugger-hooks
........
r67367 | georg.brandl | 2008-11-24 17:16:07 +0100 (Mon, 24 Nov 2008) | 2 lines
Fix typo.
........
r67368 | georg.brandl | 2008-11-24 20:56:47 +0100 (Mon, 24 Nov 2008) | 2 lines
#4404: make clear what "path" is.
........
r67370 | jeremy.hylton | 2008-11-24 23:00:29 +0100 (Mon, 24 Nov 2008) | 8 lines
Add unittests that verify documented behavior of public methods in Transport
class.
These methods can be overridden. The tests verify that the overridden
methods are called, and that changes to the connection have a visible
effect on the request.
........
2008-12-05 04:51:30 -04:00
|
|
|
class FakeSocket:
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.data = StringIO.StringIO()
|
|
|
|
|
|
|
|
def send(self, buf):
|
|
|
|
self.data.write(buf)
|
|
|
|
return len(buf)
|
|
|
|
|
|
|
|
def sendall(self, buf):
|
|
|
|
self.data.write(buf)
|
|
|
|
|
|
|
|
def getvalue(self):
|
|
|
|
return self.data.getvalue()
|
|
|
|
|
|
|
|
def makefile(self, x, y):
|
|
|
|
raise RuntimeError
|
|
|
|
|
|
|
|
class FakeTransport(xmlrpclib.Transport):
|
|
|
|
"""A Transport instance that records instead of sending a request.
|
|
|
|
|
|
|
|
This class replaces the actual socket used by httplib with a
|
|
|
|
FakeSocket object that records the request. It doesn't provide a
|
|
|
|
response.
|
|
|
|
"""
|
|
|
|
|
|
|
|
def make_connection(self, host):
|
|
|
|
conn = xmlrpclib.Transport.make_connection(self, host)
|
|
|
|
conn._conn.sock = self.fake_socket = FakeSocket()
|
|
|
|
return conn
|
|
|
|
|
|
|
|
class TransportSubclassTestCase(unittest.TestCase):
|
|
|
|
|
|
|
|
def issue_request(self, transport_class):
|
|
|
|
"""Return an HTTP request made via transport_class."""
|
|
|
|
transport = transport_class()
|
|
|
|
proxy = xmlrpclib.ServerProxy("http://example.com/",
|
|
|
|
transport=transport)
|
|
|
|
try:
|
|
|
|
proxy.pow(6, 8)
|
|
|
|
except RuntimeError:
|
|
|
|
return transport.fake_socket.getvalue()
|
|
|
|
return None
|
|
|
|
|
|
|
|
def test_custom_user_agent(self):
|
|
|
|
class TestTransport(FakeTransport):
|
|
|
|
|
|
|
|
def send_user_agent(self, conn):
|
|
|
|
xmlrpclib.Transport.send_user_agent(self, conn)
|
|
|
|
conn.putheader("X-Test", "test_custom_user_agent")
|
|
|
|
|
|
|
|
req = self.issue_request(TestTransport)
|
|
|
|
self.assert_("X-Test: test_custom_user_agent\r\n" in req)
|
|
|
|
|
|
|
|
def test_send_host(self):
|
|
|
|
class TestTransport(FakeTransport):
|
|
|
|
|
|
|
|
def send_host(self, conn, host):
|
|
|
|
xmlrpclib.Transport.send_host(self, conn, host)
|
|
|
|
conn.putheader("X-Test", "test_send_host")
|
|
|
|
|
|
|
|
req = self.issue_request(TestTransport)
|
|
|
|
self.assert_("X-Test: test_send_host\r\n" in req)
|
|
|
|
|
|
|
|
def test_send_request(self):
|
|
|
|
class TestTransport(FakeTransport):
|
|
|
|
|
|
|
|
def send_request(self, conn, url, body):
|
|
|
|
xmlrpclib.Transport.send_request(self, conn, url, body)
|
|
|
|
conn.putheader("X-Test", "test_send_request")
|
|
|
|
|
|
|
|
req = self.issue_request(TestTransport)
|
|
|
|
self.assert_("X-Test: test_send_request\r\n" in req)
|
|
|
|
|
|
|
|
def test_send_content(self):
|
|
|
|
class TestTransport(FakeTransport):
|
|
|
|
|
|
|
|
def send_content(self, conn, body):
|
|
|
|
conn.putheader("X-Test", "test_send_content")
|
|
|
|
xmlrpclib.Transport.send_content(self, conn, body)
|
|
|
|
|
|
|
|
req = self.issue_request(TestTransport)
|
|
|
|
self.assert_("X-Test: test_send_content\r\n" in req)
|
|
|
|
|
2001-10-01 14:47:44 -03:00
|
|
|
def test_main():
|
2007-08-14 10:35:00 -03:00
|
|
|
xmlrpc_tests = [XMLRPCTestCase, HelperTestCase, DateTimeTestCase,
|
Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67245 | benjamin.peterson | 2008-11-17 23:05:19 +0100 (Mon, 17 Nov 2008) | 1 line
improve __hash__ docs
........
r67277 | skip.montanaro | 2008-11-19 04:35:41 +0100 (Wed, 19 Nov 2008) | 1 line
patch from issue 1108
........
r67289 | brett.cannon | 2008-11-19 21:29:39 +0100 (Wed, 19 Nov 2008) | 2 lines
Ignore .pyc and .pyo files.
........
r67295 | benjamin.peterson | 2008-11-20 05:05:12 +0100 (Thu, 20 Nov 2008) | 1 line
move useful sys.settrace information to the function's documentation from the debugger
........
r67301 | benjamin.peterson | 2008-11-20 22:25:31 +0100 (Thu, 20 Nov 2008) | 1 line
fix indentation and a sphinx warning
........
r67302 | benjamin.peterson | 2008-11-20 22:44:23 +0100 (Thu, 20 Nov 2008) | 1 line
oops! didn't mean to disable that test
........
r67303 | benjamin.peterson | 2008-11-20 23:06:22 +0100 (Thu, 20 Nov 2008) | 1 line
backport r67300
........
r67307 | amaury.forgeotdarc | 2008-11-21 00:34:31 +0100 (Fri, 21 Nov 2008) | 9 lines
Fixed issue #4233.
Changed semantic of _fileio.FileIO's close() method on file objects with closefd=False.
The file descriptor is still kept open but the file object behaves like a closed file.
The FileIO object also got a new readonly attribute closefd.
Approved by Barry
Backport of r67106 from the py3k branch
........
r67330 | georg.brandl | 2008-11-22 09:34:14 +0100 (Sat, 22 Nov 2008) | 2 lines
#4364: fix attribute name on ctypes object.
........
r67332 | georg.brandl | 2008-11-22 09:45:33 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix typo.
........
r67336 | georg.brandl | 2008-11-22 11:08:50 +0100 (Sat, 22 Nov 2008) | 2 lines
Fix error about "-*-" being mandatory in coding cookies.
........
r67355 | georg.brandl | 2008-11-23 20:17:25 +0100 (Sun, 23 Nov 2008) | 2 lines
#4392: fix parameter name.
........
r67359 | georg.brandl | 2008-11-23 22:57:30 +0100 (Sun, 23 Nov 2008) | 2 lines
#4399: fix typo.
........
r67362 | gregory.p.smith | 2008-11-24 01:41:43 +0100 (Mon, 24 Nov 2008) | 2 lines
Document PY_SSIZE_T_CLEAN for PyArg_ParseTuple.
........
r67364 | benjamin.peterson | 2008-11-24 02:16:29 +0100 (Mon, 24 Nov 2008) | 2 lines
replace reference to debugger-hooks
........
r67367 | georg.brandl | 2008-11-24 17:16:07 +0100 (Mon, 24 Nov 2008) | 2 lines
Fix typo.
........
r67368 | georg.brandl | 2008-11-24 20:56:47 +0100 (Mon, 24 Nov 2008) | 2 lines
#4404: make clear what "path" is.
........
r67370 | jeremy.hylton | 2008-11-24 23:00:29 +0100 (Mon, 24 Nov 2008) | 8 lines
Add unittests that verify documented behavior of public methods in Transport
class.
These methods can be overridden. The tests verify that the overridden
methods are called, and that changes to the connection have a visible
effect on the request.
........
2008-12-05 04:51:30 -04:00
|
|
|
BinaryTestCase, FaultTestCase, TransportSubclassTestCase]
|
2007-08-14 10:35:00 -03:00
|
|
|
|
|
|
|
# The test cases against a SimpleXMLRPCServer raise a socket error
|
|
|
|
# 10035 (WSAEWOULDBLOCK) in the server thread handle_request call when
|
|
|
|
# run on Windows. This only happens on the first test to run, but it
|
|
|
|
# fails every time and so these tests are skipped on win32 platforms.
|
|
|
|
if sys.platform != 'win32':
|
2007-08-17 16:16:44 -03:00
|
|
|
xmlrpc_tests.append(SimpleServerTestCase)
|
|
|
|
xmlrpc_tests.append(FailingServerTestCase)
|
2007-12-07 05:07:10 -04:00
|
|
|
xmlrpc_tests.append(CGIHandlerTestCase)
|
2001-10-01 14:47:44 -03:00
|
|
|
|
2007-08-14 10:35:00 -03:00
|
|
|
test_support.run_unittest(*xmlrpc_tests)
|
2001-10-01 14:47:44 -03:00
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
test_main()
|