From ac977c865d5c819125cab7431aaae4735f6a3eb9 Mon Sep 17 00:00:00 2001
From: fijal <none@none>
Date: Fri, 26 Jan 2007 22:46:11 +0100
Subject: [PATCH] [svn r37407] Unskip two tests.

--HG--
branch : trunk
---
 py/test/rsession/master.py              |  2 +-
 py/test/rsession/testing/test_master.py | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/py/test/rsession/master.py b/py/test/rsession/master.py
index ad100990f..508b594fa 100644
--- a/py/test/rsession/master.py
+++ b/py/test/rsession/master.py
@@ -30,7 +30,7 @@ class MasterNode(object):
         else:
             self.pending.insert(0, item)
             #itemspec = item.listnames()[1:]
-            self.channel.send(item.config.get_collector_trail(item))
+            self.channel.send(item.get_collector_trail())
             # send start report
             self.reporter(report.SendItem(self.channel, item))
 
diff --git a/py/test/rsession/testing/test_master.py b/py/test/rsession/testing/test_master.py
index 3034d121e..838a6dd6a 100644
--- a/py/test/rsession/testing/test_master.py
+++ b/py/test/rsession/testing/test_master.py
@@ -38,8 +38,11 @@ class DummyChannel(object):
         assert py.std.marshal.dumps(item)
         self.sent.append(item)
 
+class Item(py.test.Item):
+    def get_collector_trail(self):
+        return (self.name,)
+
 def test_masternode():
-    py.test.skip("cannot send non-fs items nowadays")
     try:
         raise ValueError()
     except ValueError:
@@ -48,8 +51,8 @@ def test_masternode():
     ch = DummyChannel()
     reportlist = []
     mnode = MasterNode(ch, reportlist.append, {})
-    mnode.send(py.test.Item("ok"))
-    mnode.send(py.test.Item("notok"))
+    mnode.send(Item("ok"))
+    mnode.send(Item("notok"))
     ch.callback(Outcome().make_repr())
     ch.callback(Outcome(excinfo=excinfo).make_repr())
     assert len(reportlist) == 4
@@ -59,12 +62,11 @@ def test_masternode():
     assert not received[1].outcome.passed 
 
 def test_unique_nodes():
-    py.test.skip("cannot send non-fs items nowadays")
     ch = DummyChannel()
     reportlist = []
     mnode = MasterNode(ch, reportlist.append, {})
-    mnode.send(py.test.Item("ok"))
-    mnode.send(py.test.Item("ok"))
+    mnode.send(Item("ok"))
+    mnode.send(Item("ok"))
     ch.callback(Outcome().make_repr())
     ch.callback(Outcome().make_repr())
     assert len(reportlist) == 3