[py-svn] r63106 - in py/trunk/py/test: . dsession dsession/testing plugin
hpk at codespeak.net
hpk at codespeak.net
Fri Mar 20 02:09:30 CET 2009
Author: hpk
Date: Fri Mar 20 02:09:28 2009
New Revision: 63106
Modified:
py/trunk/py/test/dsession/dsession.py
py/trunk/py/test/dsession/masterslave.py
py/trunk/py/test/dsession/testing/test_dsession.py
py/trunk/py/test/dsession/testing/test_functional_dsession.py
py/trunk/py/test/dsession/testing/test_hostmanage.py
py/trunk/py/test/dsession/testing/test_masterslave.py
py/trunk/py/test/plugin/pytest_plugintester.py
py/trunk/py/test/plugin/pytest_terminal.py
py/trunk/py/test/session.py
Log:
rename host -> gateway in a couple of places
Modified: py/trunk/py/test/dsession/dsession.py
==============================================================================
--- py/trunk/py/test/dsession/dsession.py (original)
+++ py/trunk/py/test/dsession/dsession.py Fri Mar 20 02:09:28 2009
@@ -108,9 +108,9 @@
elif eventname == "collectionreport":
if ev.passed:
colitems.extend(ev.result)
- elif eventname == "hostup":
+ elif eventname == "testnodeready":
self.addhost(ev.host)
- elif eventname == "hostdown":
+ elif eventname == "testnodedown":
pending = self.removehost(ev.host)
if pending:
crashitem = pending.pop(0)
@@ -132,9 +132,9 @@
# once we are in shutdown mode we dont send
# events other than HostDown upstream
eventname, args, kwargs = self.queue.get()
- if eventname == "hostdown":
+ if eventname == "testnodedown":
ev, = args
- self.bus.notify("hostdown", ev)
+ self.bus.notify("testnodedown", ev)
self.removehost(ev.host)
if not self.host2pending:
# finished
@@ -173,7 +173,7 @@
try:
pending = self.host2pending.pop(host)
except KeyError:
- # this happens if we didn't receive a hostup event yet
+ # this happens if we didn't receive a testnodeready event yet
return []
for item in pending:
del self.item2host[item]
Modified: py/trunk/py/test/dsession/masterslave.py
==============================================================================
--- py/trunk/py/test/dsession/masterslave.py (original)
+++ py/trunk/py/test/dsession/masterslave.py Fri Mar 20 02:09:28 2009
@@ -33,11 +33,11 @@
if not self._down:
if not err:
err = "TERMINATED"
- self.notify("hostdown", event.HostDown(self.host, err))
+ self.notify("testnodedown", event.HostDown(self.host, err))
return
elif eventcall is None:
self._down = True
- self.notify("hostdown", event.HostDown(self.host, None))
+ self.notify("testnodedown", event.HostDown(self.host, None))
return
except KeyboardInterrupt:
raise
@@ -95,7 +95,7 @@
if basetemp:
self.config.basetemp = py.path.local(basetemp)
self.config.pytestplugins.do_configure(self.config)
- self.sendevent("hostup", makehostup(host))
+ self.sendevent("testnodeready", maketestnodeready(host))
try:
while 1:
task = channel.receive()
@@ -120,7 +120,7 @@
self.sendevent("itemtestreport", testrep)
-def makehostup(host="INPROCESS"):
+def maketestnodeready(host="INPROCESS"):
import sys
platinfo = {}
for name in 'platform', 'executable', 'version_info':
Modified: py/trunk/py/test/dsession/testing/test_dsession.py
==============================================================================
--- py/trunk/py/test/dsession/testing/test_dsession.py (original)
+++ py/trunk/py/test/dsession/testing/test_dsession.py Fri Mar 20 02:09:28 2009
@@ -1,5 +1,5 @@
from py.__.test.dsession.dsession import DSession, LoopState
-from py.__.test.dsession.masterslave import makehostup
+from py.__.test.dsession.masterslave import maketestnodeready
from py.__.execnet.gwmanage import GatewaySpec
from py.__.test.runner import basic_collect_report
from py.__.test import event
@@ -146,7 +146,7 @@
# setup a HostDown event
ev = event.HostDown(host1, None)
- session.queueevent("hostdown", ev)
+ session.queueevent("testnodedown", ev)
loopstate = LoopState([item])
loopstate.dowork = False
@@ -154,7 +154,7 @@
dumpqueue(session.queue)
assert loopstate.exitstatus == outcome.EXIT_NOHOSTS
- def test_hostdown_causes_reschedule_pending(self, testdir, EventRecorder):
+ def test_testnodedown_causes_reschedule_pending(self, testdir, EventRecorder):
modcol = testdir.getmodulecol("""
def test_crash():
assert 0
@@ -176,7 +176,7 @@
session.senditems([item1, item2])
host = session.item2host[item1]
ev = event.HostDown(host, None)
- session.queueevent("hostdown", ev)
+ session.queueevent("testnodedown", ev)
evrec = EventRecorder(session.bus)
loopstate = LoopState([])
session.loop_once(loopstate)
@@ -188,13 +188,13 @@
assert str(testrep.longrepr).find("crashed") != -1
assert str(testrep.longrepr).find(host.address) != -1
- def test_hostup_adds_to_available(self, testdir):
+ def test_testnodeready_adds_to_available(self, testdir):
item = testdir.getitem("def test_func(): pass")
# setup a session with two hosts
session = DSession(item.config)
host1 = GatewaySpec("localhost")
- hostup = makehostup(host1)
- session.queueevent("hostup", hostup)
+ testnodeready = maketestnodeready(host1)
+ session.queueevent("testnodeready", testnodeready)
loopstate = LoopState([item])
loopstate.dowork = False
assert len(session.host2pending) == 0
@@ -225,7 +225,7 @@
session.queueevent("itemtestreport", ev)
session.loop_once(loopstate)
assert loopstate.shuttingdown
- session.queueevent("hostdown", event.HostDown(host1, None))
+ session.queueevent("testnodedown", event.HostDown(host1, None))
session.loop_once(loopstate)
dumpqueue(session.queue)
return session, loopstate.exitstatus
@@ -278,11 +278,11 @@
evrec = EventRecorder(session.bus)
session.queueevent("itemtestreport", run(item))
session.loop_once(loopstate)
- assert not evrec.getfirstnamed("hostdown")
+ assert not evrec.getfirstnamed("testnodedown")
ev = event.HostDown(host)
- session.queueevent("hostdown", ev)
+ session.queueevent("testnodedown", ev)
session.loop_once(loopstate)
- assert evrec.getfirstnamed('hostdown') == ev
+ assert evrec.getfirstnamed('testnodedown') == ev
def test_filteritems(self, testdir, EventRecorder):
modcol = testdir.getmodulecol("""
@@ -313,7 +313,7 @@
assert event.name == "deselected"
assert event.args[0].items == [items[1]]
- def test_hostdown_shutdown_after_completion(self, testdir):
+ def test_testnodedown_shutdown_after_completion(self, testdir):
item = testdir.getitem("def test_func(): pass")
session = DSession(item.config)
@@ -325,9 +325,9 @@
loopstate = LoopState([])
session.loop_once(loopstate)
assert host.node._shutdown is True
- assert loopstate.exitstatus is None, "loop did not wait for hostdown"
+ assert loopstate.exitstatus is None, "loop did not wait for testnodedown"
assert loopstate.shuttingdown
- session.queueevent("hostdown", event.HostDown(host, None))
+ session.queueevent("testnodedown", event.HostDown(host, None))
session.loop_once(loopstate)
assert loopstate.exitstatus == 0
Modified: py/trunk/py/test/dsession/testing/test_functional_dsession.py
==============================================================================
--- py/trunk/py/test/dsession/testing/test_functional_dsession.py (original)
+++ py/trunk/py/test/dsession/testing/test_functional_dsession.py Fri Mar 20 02:09:28 2009
@@ -53,7 +53,7 @@
ev, = eq.geteventargs("itemtestreport")
assert ev.failed
# see that the host is really down
- ev, = eq.geteventargs("hostdown")
+ ev, = eq.geteventargs("testnodedown")
assert ev.host.address == "popen"
ev, = eq.geteventargs("testrunfinish")
Modified: py/trunk/py/test/dsession/testing/test_hostmanage.py
==============================================================================
--- py/trunk/py/test/dsession/testing/test_hostmanage.py (original)
+++ py/trunk/py/test/dsession/testing/test_hostmanage.py Fri Mar 20 02:09:28 2009
@@ -147,15 +147,6 @@
ev = sorter.getfirstnamed("itemtestreport")
assert ev.passed
- def test_rsync_samehost_twice(self):
- host1 = Host("%s" % (sshhost, ))
- host2 = Host("%s" % (sshhost, ))
- hm = HostManager(config, hosts=[host1, host2])
- events = []
- hm.init_rsync(events.append)
- print events
- assert 0
-
def test_getconfiggwspecs_numprocesses():
config = py.test.config._reparse(['-n3'])
Modified: py/trunk/py/test/dsession/testing/test_masterslave.py
==============================================================================
--- py/trunk/py/test/dsession/testing/test_masterslave.py (original)
+++ py/trunk/py/test/dsession/testing/test_masterslave.py Fri Mar 20 02:09:28 2009
@@ -70,7 +70,7 @@
def test_crash_invalid_item(self, mysetup):
node = mysetup.makenode()
node.send(123) # invalid item
- ev, = mysetup.geteventargs("hostdown")
+ ev, = mysetup.geteventargs("testnodedown")
assert ev.host == mysetup.host
assert str(ev.error).find("AttributeError") != -1
@@ -84,19 +84,19 @@
""")
node = mysetup.makenode(item.config)
node.send(item)
- ev, = mysetup.geteventargs("hostdown")
+ ev, = mysetup.geteventargs("testnodedown")
assert ev.host == mysetup.host
assert str(ev.error).find("TERMINATED") != -1
def test_node_down(self, mysetup):
node = mysetup.makenode()
node.shutdown()
- ev, = mysetup.geteventargs("hostdown")
+ ev, = mysetup.geteventargs("testnodedown")
assert ev.host == mysetup.host
assert not ev.error
node.callback(node.ENDMARK)
excinfo = py.test.raises(IOError,
- "mysetup.geteventargs('hostdown', timeout=0.01)")
+ "mysetup.geteventargs('testnodedown', timeout=0.01)")
def test_send_on_closed_channel(self, testdir, mysetup):
item = testdir.getitem("def test_func(): pass")
Modified: py/trunk/py/test/plugin/pytest_plugintester.py
==============================================================================
--- py/trunk/py/test/plugin/pytest_plugintester.py (original)
+++ py/trunk/py/test/plugin/pytest_plugintester.py Fri Mar 20 02:09:28 2009
@@ -200,10 +200,10 @@
within the gateway manager context.
"""
- def pyevent_hostup(self, event):
+ def pyevent_testnodeready(self, event):
""" Host is up. """
- def pyevent_hostdown(self, event):
+ def pyevent_testnodedown(self, event):
""" Host is down. """
def pyevent_rescheduleitems(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 Mar 20 02:09:28 2009
@@ -103,7 +103,7 @@
# which garbles our output if we use self.write_line
self.write_line(msg)
- def pyevent_hostup(self, event):
+ def pyevent_testnodeready(self, event):
d = event.platinfo.copy()
d['host'] = getattr(event.host, 'address', event.host)
d['version'] = repr_pythonversion(d['sys.version_info'])
@@ -111,7 +111,7 @@
"%(sys.executable)s - Python %(version)s" %
d)
- def pyevent_hostdown(self, event):
+ def pyevent_testnodedown(self, event):
host = event.host
error = event.error
if error:
@@ -323,13 +323,13 @@
from py.__.test import event
from py.__.test.runner import basic_run_report
-from py.__.test.dsession.masterslave import makehostup
+from py.__.test.dsession.masterslave import maketestnodeready
class TestTerminal:
- def test_hostup(self, testdir, linecomp):
+ def test_testnodeready(self, testdir, linecomp):
item = testdir.getitem("def test_func(): pass")
rep = TerminalReporter(item.config, linecomp.stringio)
- rep.pyevent_hostup(makehostup())
+ rep.pyevent_testnodeready(maketestnodeready())
linecomp.assert_contains_lines([
"*INPROCESS* %s %s - Python %s" %(sys.platform,
sys.executable, repr_pythonversion(sys.version_info))
Modified: py/trunk/py/test/session.py
==============================================================================
--- py/trunk/py/test/session.py (original)
+++ py/trunk/py/test/session.py Fri Mar 20 02:09:28 2009
@@ -12,7 +12,7 @@
Item = py.test.collect.Item
Collector = py.test.collect.Collector
from runner import basic_collect_report
-from py.__.test.dsession.masterslave import makehostup
+from py.__.test.dsession.masterslave import maketestnodeready
class Session(object):
"""
@@ -117,7 +117,7 @@
colitems = self.getinitialitems(colitems)
self.shouldstop = False
self.sessionstarts()
- self.bus.notify("hostup", makehostup())
+ self.bus.notify("testnodeready", maketestnodeready())
exitstatus = outcome.EXIT_OK
captured_excinfo = None
try:
More information about the pytest-commit
mailing list