From 9620583e826de2ac9caf4105f2760312d4065b3a Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 17 Apr 2009 14:06:38 +0200 Subject: [PATCH] remove unused import, fix failing test mode --HG-- branch : trunk --- py/test/dist/dsession.py | 2 +- py/test/runner.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/py/test/dist/dsession.py b/py/test/dist/dsession.py index 93d17d308..c1ac51068 100644 --- a/py/test/dist/dsession.py +++ b/py/test/dist/dsession.py @@ -203,7 +203,7 @@ class DSession(Session): tosend[:] = tosend[room:] # update inplace if tosend: # we have some left, give it to the main loop - self.queueevent(pytest_rescheduleitems, tosend) + self.queueevent("pytest_rescheduleitems", items=tosend) def senditems_load(self, tosend): if not tosend: diff --git a/py/test/runner.py b/py/test/runner.py index 6684a8fae..e89f15071 100644 --- a/py/test/runner.py +++ b/py/test/runner.py @@ -53,8 +53,6 @@ def basic_collect_report(collector): excinfo = py.code.ExceptionInfo() return CollectReport(collector, res, excinfo, outerr) -from cPickle import Pickler, Unpickler - def forked_run_report(item, pdb=None): EXITSTATUS_TESTEXIT = 4 from py.__.test.dist.mypickle import ImmutablePickler