floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r37407] Unskip two tests. 

--HG--
branch : trunk
This commit is contained in:
fijal 2007-01-26 22:46:11 +01:00
parent 3c08f6a614
commit ac977c865d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/test/rsession/master.py
View File

@ -30,7 +30,7 @@ class MasterNode(object):
else: else:
self.pending.insert(0, item) self.pending.insert(0, item)
#itemspec = item.listnames()[1:] #itemspec = item.listnames()[1:]
self.channel.send(item.config.get_collector_trail(item)) self.channel.send(item.get_collector_trail())
# send start report # send start report
self.reporter(report.SendItem(self.channel, item)) self.reporter(report.SendItem(self.channel, item))

14
py/test/rsession/testing/test_master.py
View File

@ -38,8 +38,11 @@ class DummyChannel(object):
assert py.std.marshal.dumps(item) assert py.std.marshal.dumps(item)
self.sent.append(item) self.sent.append(item)
class Item(py.test.Item):
def get_collector_trail(self):
return (self.name,)
def test_masternode(): def test_masternode():
py.test.skip("cannot send non-fs items nowadays")
try: try:
raise ValueError() raise ValueError()
except ValueError: except ValueError:
@ -48,8 +51,8 @@ def test_masternode():
ch = DummyChannel() ch = DummyChannel()
reportlist = [] reportlist = []
mnode = MasterNode(ch, reportlist.append, {}) mnode = MasterNode(ch, reportlist.append, {})
mnode.send(py.test.Item("ok")) mnode.send(Item("ok"))
mnode.send(py.test.Item("notok")) mnode.send(Item("notok"))
ch.callback(Outcome().make_repr()) ch.callback(Outcome().make_repr())
ch.callback(Outcome(excinfo=excinfo).make_repr()) ch.callback(Outcome(excinfo=excinfo).make_repr())
assert len(reportlist) == 4 assert len(reportlist) == 4
@ -59,12 +62,11 @@ def test_masternode():
assert not received[1].outcome.passed assert not received[1].outcome.passed
def test_unique_nodes(): def test_unique_nodes():
py.test.skip("cannot send non-fs items nowadays")
ch = DummyChannel() ch = DummyChannel()
reportlist = [] reportlist = []
mnode = MasterNode(ch, reportlist.append, {}) mnode = MasterNode(ch, reportlist.append, {})
mnode.send(py.test.Item("ok")) mnode.send(Item("ok"))
mnode.send(py.test.Item("ok")) mnode.send(Item("ok"))
ch.callback(Outcome().make_repr()) ch.callback(Outcome().make_repr())
ch.callback(Outcome().make_repr()) ch.callback(Outcome().make_repr())
assert len(reportlist) == 3 assert len(reportlist) == 3