Merge lp:~marienz/ampoule/fix-childReactor-test into lp:ampoule

Proposed by Marien Zwart
Status: Merged
Merged at revision: 45
Proposed branch: lp:~marienz/ampoule/fix-childReactor-test
Merge into: lp:ampoule
Diff against target: 28 lines (+10/-2)
1 file modified
ampoule/test/test_process.py (+10/-2)
To merge this branch: bzr merge lp:~marienz/ampoule/fix-childReactor-test
Reviewer Review Type Date Requested Status
dialtone Pending
Review via email: mp+40401@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ampoule/test/test_process.py'
2--- ampoule/test/test_process.py 2010-03-01 19:35:21 +0000
3+++ ampoule/test/test_process.py 2010-11-09 03:14:41 +0000
4@@ -710,14 +710,22 @@
5 SECOND = "poll"
6
7 def checkDefault():
8- pp = pool.ProcessPool(starter=main.ProcessStarter(childReactor=FIRST), ampChild=ReactorChild, min=MIN, max=MAX)
9+ pp = pool.ProcessPool(
10+ starter=main.ProcessStarter(
11+ childReactor=FIRST,
12+ packages=("twisted", "ampoule")),
13+ ampChild=ReactorChild, min=MIN, max=MAX)
14 pp.start()
15 return pp.doWork(Reactor
16 ).addCallback(self.assertEquals, {'classname': "SelectReactor"}
17 ).addCallback(lambda _: pp.stop())
18
19 def checkPool(_):
20- pp = pool.ProcessPool(starter=main.ProcessStarter(childReactor=SECOND), ampChild=ReactorChild, min=MIN, max=MAX)
21+ pp = pool.ProcessPool(
22+ starter=main.ProcessStarter(
23+ childReactor=SECOND,
24+ packages=("twisted", "ampoule")),
25+ ampChild=ReactorChild, min=MIN, max=MAX)
26 pp.start()
27 return pp.doWork(Reactor
28 ).addCallback(self.assertEquals, {'classname': "PollReactor"}

Subscribers

People subscribed via source and target branches