# HG changeset patch -- Bitbucket.org
# Project pytest
# URL http://bitbucket.org/hpk42/pytest/overview
# User Maciej Fijalkowski <fij...@gmail.com>
# Date 1290604000 -7200
# Node ID 19df6d3f871fce3005bbef752f28249669233410
# Parent 48c7827675cc8159dd86b71aee4c29fbb8e20cd5
Finish the test
--- a/testing/test_unittest.py
+++ b/testing/test_unittest.py
@@ -228,7 +228,7 @@ class TestTrialUnittest:
def test_trial_error(self, testdir):
testdir.makepyfile("""
from twisted.trial.unittest import TestCase
- from twisted.internet.defer import inlineCallbacks
+ from twisted.internet.defer import Deferred
from twisted.internet import reactor
class TC(TestCase):
@@ -238,13 +238,16 @@ class TestTrialUnittest:
def test_two(self):
def f(_):
crash
-
- return reactor.callLater(0.3, f)
+
+ d = Deferred()
+ d.addCallback(f)
+ reactor.callLater(0.3, d.callback, None)
+ return d
def test_three(self):
def f():
pass # will never get called
- return reactor.callLater(0.3, f)
+ reactor.callLater(0.3, f)
# will crash at teardown
def test_four(self):
@@ -252,7 +255,10 @@ class TestTrialUnittest:
reactor.callLater(0.3, f)
crash
- return reactor.callLater(0.3, f)
+ d = Deferred()
+ d.addCallback(f)
+ reactor.callLater(0.3, d.callback, None)
+ return d
# will crash both at test time and at teardown
""")
result = testdir.runpytest()
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
