[py-svn] r63571 - in py/trunk/py/test: . dist dist/testing plugin testing
hpk at codespeak.net
hpk at codespeak.net
Fri Apr 3 17:47:17 CEST 2009
Author: hpk
Date: Fri Apr 3 17:47:16 2009
New Revision: 63571
Modified:
py/trunk/py/test/dist/dsession.py
py/trunk/py/test/dist/testing/test_dsession.py
py/trunk/py/test/event.py
py/trunk/py/test/plugin/api.py
py/trunk/py/test/plugin/pytest_terminal.py
py/trunk/py/test/session.py
py/trunk/py/test/testing/test_genitems.py
py/trunk/py/test/testing/test_session.py
Log:
kill another few test "events"
Modified: py/trunk/py/test/dist/dsession.py
==============================================================================
--- py/trunk/py/test/dist/dsession.py (original)
+++ py/trunk/py/test/dist/dsession.py Fri Apr 3 17:47:16 2009
@@ -45,8 +45,8 @@
self.dsession.handle_crashitem(crashitem, node)
self.colitems.extend(pending[1:])
- def pyevent__rescheduleitems(self, event):
- self.colitems.extend(event.items)
+ def pyevent__rescheduleitems(self, items):
+ self.colitems.extend(items)
self.dowork = False # avoid busywait
class DSession(Session):
@@ -175,7 +175,7 @@
if isinstance(next, py.test.collect.Item):
senditems.append(next)
else:
- self.bus.notify("collectionstart", event.CollectionStart(next))
+ self.bus.notify("collectionstart", next)
self.queueevent("collectionreport", basic_collect_report(next))
if self.config.option.dist == "each":
self.senditems_each(senditems)
@@ -202,7 +202,7 @@
tosend[:] = tosend[room:] # update inplace
if tosend:
# we have some left, give it to the main loop
- self.queueevent("rescheduleitems", event.RescheduleItems(tosend))
+ self.queueevent("rescheduleitems", tosend)
def senditems_load(self, tosend):
if not tosend:
@@ -224,7 +224,7 @@
break
if tosend:
# we have some left, give it to the main loop
- self.queueevent("rescheduleitems", event.RescheduleItems(tosend))
+ self.queueevent("rescheduleitems", tosend)
def removeitem(self, item, node):
if item not in self.item2nodes:
Modified: py/trunk/py/test/dist/testing/test_dsession.py
==============================================================================
--- py/trunk/py/test/dist/testing/test_dsession.py (original)
+++ py/trunk/py/test/dist/testing/test_dsession.py Fri Apr 3 17:47:16 2009
@@ -101,8 +101,8 @@
assert session.node2pending[node2] == sent2
name, args, kwargs = session.queue.get(block=False)
assert name == "rescheduleitems"
- ev, = args
- assert ev.items == [item]
+ items, = args
+ assert items == [item]
def test_keyboardinterrupt(self, testdir):
item = testdir.getitem("def test_func(): pass")
@@ -125,9 +125,8 @@
session = DSession(item.config)
node = MockNode()
session.addnode(node)
- ev = event.RescheduleItems([item])
loopstate = session._initloopstate([])
- session.queueevent("rescheduleitems", ev)
+ session.queueevent("rescheduleitems", [item])
session.loop_once(loopstate)
# check that RescheduleEvents are not immediately
# rescheduled if there are no nodes
@@ -298,17 +297,15 @@
remaining = session.filteritems(items)
assert remaining == []
- event = evrec.events[-1]
- assert event.name == "deselected"
- assert event.args[0].items == items
+ event = evrec.getevents("deselected")[-1]
+ assert event.items == items
modcol.config.option.keyword = "test_fail"
remaining = session.filteritems(items)
assert remaining == [items[0]]
- event = evrec.events[-1]
- assert event.name == "deselected"
- assert event.args[0].items == [items[1]]
+ event = evrec.getevents("deselected")[-1]
+ assert event.items == [items[1]]
def test_testnodedown_shutdown_after_completion(self, testdir):
item = testdir.getitem("def test_func(): pass")
Modified: py/trunk/py/test/event.py
==============================================================================
--- py/trunk/py/test/event.py (original)
+++ py/trunk/py/test/event.py Fri Apr 3 17:47:16 2009
@@ -12,9 +12,6 @@
for key, value in self.__dict__.items()]
return "<%s %s>" %(self.__class__.__name__, " ".join(l),)
-def timestamp():
- return time.time()
-
class NOP(BaseEvent):
pass
@@ -22,10 +19,6 @@
# Events related to collecting and executing test Items
# ----------------------------------------------------------------------
-class Deselected(BaseEvent):
- def __init__(self, items):
- self.items = items
-
class BaseReport(BaseEvent):
def toterminal(self, out):
longrepr = self.longrepr
@@ -73,9 +66,6 @@
self.shortrepr = shortrepr
self.longrepr = longrepr
-class CollectionStart(BaseEvent):
- def __init__(self, collector):
- self.collector = collector
class CollectionReport(BaseReport):
""" Collection Report. """
@@ -108,30 +98,6 @@
self.failreports = failreports
self.rootdirs = rootdirs
-# ----------------------------------------------------------------------
-# Distributed Testing Events
-# ----------------------------------------------------------------------
-
-class RescheduleItems(BaseEvent):
- def __init__(self, items):
- self.items = items
-
-# ---------------------------------------------------------------------
-# Events related to rsyncing
-# ---------------------------------------------------------------------
-
-class HostRSyncing(BaseEvent):
- def __init__(self, host, root, remotepath, synced):
- self.host = host
- self.root = root
- self.remotepath = remotepath
- self.synced = synced
-
-class HostRSyncRootReady(BaseEvent):
- def __init__(self, host, root):
- self.host = host
- self.root = root
-
# make all eventclasses available on BaseEvent so that
# consumers of events can easily filter by
# 'isinstance(event, event.Name)' checks
Modified: py/trunk/py/test/plugin/api.py
==============================================================================
--- py/trunk/py/test/plugin/api.py (original)
+++ py/trunk/py/test/plugin/api.py Fri Apr 3 17:47:16 2009
@@ -82,10 +82,10 @@
def pyevent__itemtestreport(self, event):
""" test has been run. """
- def pyevent__deselected(self, event):
- """ item has been dselected. """
+ def pyevent__deselected(self, items):
+ """ collected items that were deselected (by keyword). """
- def pyevent__collectionstart(self, event):
+ def pyevent__collectionstart(self, collector):
""" collector starts collecting. """
def pyevent__collectionreport(self, event):
Modified: py/trunk/py/test/plugin/pytest_terminal.py
==============================================================================
--- py/trunk/py/test/plugin/pytest_terminal.py (original)
+++ py/trunk/py/test/plugin/pytest_terminal.py Fri Apr 3 17:47:16 2009
@@ -158,8 +158,8 @@
if self.config.option.debug:
self.write_sep("!", "RESCHEDULING %s " %(event.items,))
- def pyevent__deselected(self, event):
- self.stats.setdefault('deselected', []).append(event)
+ def pyevent__deselected(self, items):
+ self.stats.setdefault('deselected', []).append(items)
def pyevent__itemtestreport(self, event):
fspath = event.colitem.fspath
@@ -309,8 +309,8 @@
def outindent(self, line):
self.out.line(self.indent + str(line))
- def pyevent__collectionstart(self, event):
- self.outindent(event.collector)
+ def pyevent__collectionstart(self, collector):
+ self.outindent(collector)
self.indent += self.INDENT
def pyevent__itemstart(self, item, node=None):
@@ -627,7 +627,7 @@
rep = CollectonlyReporter(modcol.config, out=linecomp.stringio)
modcol.config.bus.register(rep)
indent = rep.indent
- rep.config.bus.notify("collectionstart", event.CollectionStart(modcol))
+ rep.config.bus.notify("collectionstart", modcol)
linecomp.assert_contains_lines([
"<Module 'test_collectonly_basic.py'>"
])
Modified: py/trunk/py/test/session.py
==============================================================================
--- py/trunk/py/test/session.py (original)
+++ py/trunk/py/test/session.py Fri Apr 3 17:47:16 2009
@@ -42,7 +42,7 @@
yield next
else:
assert isinstance(next, Collector)
- notify("collectionstart", event.CollectionStart(next))
+ notify("collectionstart", next)
ev = basic_collect_report(next)
if ev.passed:
for x in self.genitems(ev.result, keywordexpr):
@@ -67,7 +67,7 @@
continue
remaining.append(colitem)
if deselected:
- self.bus.notify("deselected", event.Deselected(deselected, ))
+ self.bus.notify("deselected", deselected)
if self.config.option.keyword.endswith(":"):
self._nomatch = True
return remaining
Modified: py/trunk/py/test/testing/test_genitems.py
==============================================================================
--- py/trunk/py/test/testing/test_genitems.py (original)
+++ py/trunk/py/test/testing/test_genitems.py Fri Apr 3 17:47:16 2009
@@ -74,7 +74,7 @@
passed, skipped, failed = sorter.listoutcomes()
assert len(failed) == 1
assert failed[0].colitem.name == name
- assert len(sorter.getnamed('deselected')) == 1
+ assert len(sorter.getevents('deselected')) == 1
for keyword in ['test_one', 'est_on']:
#yield check, keyword, 'test_one'
@@ -102,7 +102,7 @@
passed, skipped, failed = sorter.listoutcomes()
assert len(passed) == 1
assert passed[0].colitem.name == "test_2"
- dlist = sorter.getnamed("deselected")
+ dlist = sorter.getevents("deselected")
assert len(dlist) == 1
assert dlist[0].items[0].name == 'test_1'
@@ -116,7 +116,7 @@
passed, skipped, failed = sorter.listoutcomes()
assert len(passed) == 2
assert not failed
- dlist = sorter.getnamed("deselected")
+ dlist = sorter.getevents("deselected")
assert len(dlist) == 1
item = dlist[0].items[0]
assert item.name == "test_one"
Modified: py/trunk/py/test/testing/test_session.py
==============================================================================
--- py/trunk/py/test/testing/test_session.py (original)
+++ py/trunk/py/test/testing/test_session.py Fri Apr 3 17:47:16 2009
@@ -29,7 +29,7 @@
assert len(itemstarted) == 4
colstarted = sorter.getevents("collectionstart")
assert len(colstarted) == 1
- col = colstarted[0].event.collector
+ col = colstarted[0].collector
assert isinstance(col, py.test.collect.Module)
def test_nested_import_error(self, testdir):
@@ -204,7 +204,7 @@
itemstarted = sorter.getnamed("itemstart")
assert len(itemstarted) == 3
assert not sorter.getnamed("itemtestreport")
- started = sorter.getnamed("collectionstart")
+ started = sorter.getevents("collectionstart")
finished = sorter.getnamed("collectionreport")
assert len(started) == len(finished)
assert len(started) == 8
More information about the pytest-commit
mailing list