[svn r63932] * Fixed broken setup_method()-mechanism.
* Added --twisted-logging option. * Added example test-script to the plugin-test. --HG-- branch : trunk
This commit is contained in:
mzeidler
parent
0b554bf925
commit
59bd09ce9a
|
|
@ -1,15 +1,16 @@
|
|||
"""
|
||||
Notes: twisted's asynchrone behavior may have influence on the order of test-functions
|
||||
|
||||
TODO:
|
||||
+ switching on this plugin breaks 'setup_method' mechanism which then is not previously called before the test function.
|
||||
+ credits to Ralf Schmitt See: http://twistedmatrix.com/pipermail/twisted-python/2007-February/014872.html
|
||||
+ add option for twisted logging
|
||||
+ write tests
|
||||
+ get test to work
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
import py
|
||||
|
||||
try:
|
||||
from twisted.internet.defer import Deferred
|
||||
except ImportError:
|
||||
|
|
@ -22,10 +23,10 @@ except ImportError:
|
|||
"http://pypi.python.org/pypi/greenlet"
|
||||
sys.exit(0)
|
||||
|
||||
DIR_CUR = str(py.path.local())
|
||||
|
||||
|
||||
def _start_twisted_logging():
|
||||
"""Enables twisted internal logging"""
|
||||
|
||||
class Logger(object):
|
||||
"""late-bound sys.stdout"""
|
||||
def write(self, msg):
|
||||
|
|
@ -34,31 +35,38 @@ def _start_twisted_logging():
|
|||
def flush(self):
|
||||
sys.stdout.flush()
|
||||
# sys.stdout will be changed by py.test later.
|
||||
|
||||
import twisted.python.log
|
||||
twisted.python.log.startLogging(Logger(), setStdout=0)
|
||||
|
||||
def _run_twisted():
|
||||
"""greenlet: run twisted mainloop"""
|
||||
def _run_twisted(logging=False):
|
||||
"""Start twisted mainloop and initialize recursive calling of doit()."""
|
||||
|
||||
from twisted.internet import reactor, defer
|
||||
from twisted.python import log, failure
|
||||
failure.Failure.cleanFailure = lambda *args: None # make twisted copy traceback...
|
||||
_start_twisted_logging() # XXX: add py.test option
|
||||
|
||||
def doit(val):
|
||||
# make twisted copy traceback...
|
||||
failure.Failure.cleanFailure = lambda *args: None
|
||||
if logging:
|
||||
_start_twisted_logging()
|
||||
# recursively called for each test-function/method due done()
|
||||
def doit(val): # val always None
|
||||
# switch context to wait that wrapper() passes back to test-method
|
||||
res = gr_tests.switch(val)
|
||||
if res is None:
|
||||
reactor.stop()
|
||||
return
|
||||
|
||||
|
||||
def done(res):
|
||||
reactor.callLater(0.0, doit, None)
|
||||
reactor.callLater(0.0, doit, None) # recursive call of doit()
|
||||
|
||||
def err(res):
|
||||
reactor.callLater(0.0, doit, res)
|
||||
|
||||
# the test-function *may* return a deferred
|
||||
# here the test-function will actually been called
|
||||
# done() is finalizing a test-process by assureing recursive envoking
|
||||
# of doit()
|
||||
defer.maybeDeferred(res).addCallback(done).addErrback(err)
|
||||
|
||||
# initialy preparing the calling of doit() and starting the reactor
|
||||
reactor.callLater(0.0, doit, None)
|
||||
reactor.run()
|
||||
|
||||
|
|
@ -67,27 +75,42 @@ class TwistedPlugin:
|
|||
"""Allows to test twisted applications with pytest."""
|
||||
|
||||
def pytest_addoption(self, parser):
|
||||
parser.addoption("--twisted", dest="twisted",
|
||||
help="Allows to test twisted applications with pytest.")
|
||||
#parser.addoption("--twisted", dest="twisted",
|
||||
# help="Allows to test twisted applications with pytest.")
|
||||
|
||||
group = parser.addgroup('twisted options')
|
||||
group.addoption('-T', action='store_true', default=False,
|
||||
dest = 'twisted',
|
||||
help="Allows to test twisted applications.")
|
||||
group.addoption('--twisted-logging', action='store', default=False,
|
||||
dest='twisted_logging',
|
||||
help="switch on twisted internal logging")
|
||||
self.twisted = False
|
||||
|
||||
def pytest_configure(self, config):
|
||||
twisted = config.getvalue("twisted")
|
||||
twisted = config.getvalue("twisted")
|
||||
twisted_logging = config.getvalue("twisted_logging")
|
||||
if twisted:
|
||||
print "Twisted plugin switched on"
|
||||
gr_twisted.switch()
|
||||
self.twisted = True
|
||||
gr_twisted.switch(twisted_logging)
|
||||
|
||||
def pytest_unconfigure(self, config):
|
||||
gr_twisted.switch(None)
|
||||
if self.twisted:
|
||||
gr_twisted.switch(None)
|
||||
|
||||
def pytest_pyfunc_call(self, pyfuncitem, *args, **kwargs):
|
||||
def wrapper(func):
|
||||
res = func.obj()
|
||||
if isinstance(res, Deferred):
|
||||
res = gr_twisted.switch(func.obj)
|
||||
if res:
|
||||
res.raiseException()
|
||||
return res
|
||||
pyfuncitem = wrapper(pyfuncitem)
|
||||
if self.twisted:
|
||||
def wrapper(func):
|
||||
"""
|
||||
wrapper just to pass back (injecting) the test-function into
|
||||
doit() by using a greenlet switch.
|
||||
"""
|
||||
if hasattr(func, 'obj'):
|
||||
# XXX: what about **kwargs?
|
||||
res = gr_twisted.switch(lambda: func.obj(*args))
|
||||
if res:
|
||||
res.raiseException()
|
||||
pyfuncitem = wrapper(pyfuncitem)
|
||||
|
||||
|
||||
gr_twisted = greenlet(_run_twisted)
|
||||
|
|
@ -97,19 +120,87 @@ gr_tests = greenlet.getcurrent()
|
|||
# plugin tests
|
||||
# ===============================================================================
|
||||
|
||||
# XXX: write test
|
||||
'''
|
||||
def test_generic(plugintester):
|
||||
plugintester.apicheck(EventlogPlugin)
|
||||
plugintester.apicheck(TwistedPlugin)
|
||||
|
||||
testdir = plugintester.testdir()
|
||||
testdir.makepyfile("""
|
||||
testdir.makepyfile('''
|
||||
def test_pass():
|
||||
pass
|
||||
""")
|
||||
testdir.runpytest("--twisted")
|
||||
s = testdir.tmpdir.join("event.log").read()
|
||||
assert s.find("TestrunStart") != -1
|
||||
assert s.find("ItemTestReport") != -1
|
||||
assert s.find("TestrunFinish") != -1
|
||||
'''
|
||||
from twisted.internet import defer, reactor
|
||||
from twisted.python import failure
|
||||
from twisted.python import log
|
||||
|
||||
|
||||
def test_no_deferred():
|
||||
assert True is True
|
||||
|
||||
def test_deferred():
|
||||
log.msg("test_deferred() called")
|
||||
d = defer.Deferred()
|
||||
def done():
|
||||
log.msg("test_deferred.done() CALLBACK DONE")
|
||||
d.callback(None)
|
||||
|
||||
reactor.callLater(2.5, done)
|
||||
log.msg("test_deferred() returning deferred: %r" % (d,))
|
||||
return d
|
||||
|
||||
def test_deferred2():
|
||||
log.msg("test_deferred2() called")
|
||||
d = defer.Deferred()
|
||||
def done():
|
||||
log.msg("test_deferred2.done() CALLBACK DONE")
|
||||
d.callback(None)
|
||||
|
||||
reactor.callLater(2.5, done)
|
||||
log.msg("test_deferred2() returning deferred: %r" % (d,))
|
||||
return d
|
||||
|
||||
def test_deferred4():
|
||||
log.msg("test_deferred4() called")
|
||||
from twisted.web.client import getPage
|
||||
def printContents(contents):
|
||||
assert contents == ""
|
||||
|
||||
deferred = getPage('http://twistedmatrix.com/')
|
||||
deferred.addCallback(printContents)
|
||||
return deferred
|
||||
|
||||
def test_deferred3():
|
||||
log.msg("test_deferred3() called")
|
||||
d = defer.Deferred()
|
||||
def done():
|
||||
log.msg("test_deferred3.done() CALLBACK DONE")
|
||||
d.callback(None)
|
||||
|
||||
reactor.callLater(2.5, done)
|
||||
log.msg("test_deferred3() returning deferred: %r" % (d,))
|
||||
return d
|
||||
|
||||
class TestTwistedSetupMethod:
|
||||
def setup_method(self, method):
|
||||
log.msg("TestTwistedSetupMethod.setup_method() called")
|
||||
|
||||
def test_deferred(self):
|
||||
log.msg("TestTwistedSetupMethod.test_deferred() called")
|
||||
d = defer.Deferred()
|
||||
def done():
|
||||
log.msg("TestTwistedSetupMethod.test_deferred() CALLBACK DONE")
|
||||
d.callback(None)
|
||||
|
||||
reactor.callLater(2.5, done)
|
||||
log.msg("TestTwistedSetupMethod.test_deferred() returning deferred: %r" % (d,))
|
||||
return d
|
||||
|
||||
|
||||
def test_defer_fail():
|
||||
def fun():
|
||||
log.msg("provoking NameError")
|
||||
rsdfg
|
||||
return defer.maybeDeferred(fun)
|
||||
''')
|
||||
testdir.runpytest("-T")
|
||||
# XXX: what to do?
|
||||
# s = testdir.tmpdir.join("event.log").read()
|
||||
# assert s.find("TestrunFinish") != -1
|
||||
|
|
|
|||
Loading…
Reference in New Issue