From 46a91b370503994701551eca7cbb05c7d0ff8a47 Mon Sep 17 00:00:00 2001
From: fijal <none@none>
Date: Sat, 3 Feb 2007 19:00:04 +0100
Subject: [PATCH] [svn r37876] s/get_collector_trail/_get_collector_trail/

--HG--
branch : trunk
---
 py/doc/TODO.txt                         |  2 +-
 py/test/collect.py                      |  2 +-
 py/test/rsession/master.py              |  2 +-
 py/test/rsession/testing/test_master.py |  4 ++--
 py/test/rsession/testing/test_slave.py  | 14 +++++++-------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/py/doc/TODO.txt b/py/doc/TODO.txt
index 600a56baa..e8b759420 100644
--- a/py/doc/TODO.txt
+++ b/py/doc/TODO.txt
@@ -81,7 +81,7 @@ APIGEN / source viewer
 * private py.test not-meant-to-be-public API: 
   here is a rough list what we want public on collectors: 
 
-  py.test.Collector.
+  py.test.collect.Collector.
         startcapture()
         finishcapture()
         setup()
diff --git a/py/test/collect.py b/py/test/collect.py
index 74a0e69b1..55d81284e 100644
--- a/py/test/collect.py
+++ b/py/test/collect.py
@@ -231,7 +231,7 @@ class Collector(object):
     def getouterr(self): 
         return self.captured_out, self.captured_err
 
-    def get_collector_trail(self):
+    def _get_collector_trail(self):
         """ Shortcut
         """
         return self.config.get_collector_trail(self)
diff --git a/py/test/rsession/master.py b/py/test/rsession/master.py
index 508b594fa..1ddae78b0 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.get_collector_trail())
+            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 838a6dd6a..a3bd5d624 100644
--- a/py/test/rsession/testing/test_master.py
+++ b/py/test/rsession/testing/test_master.py
@@ -39,7 +39,7 @@ class DummyChannel(object):
         self.sent.append(item)
 
 class Item(py.test.Item):
-    def get_collector_trail(self):
+    def _get_collector_trail(self):
         return (self.name,)
 
 def test_masternode():
@@ -96,7 +96,7 @@ def test_slave_setup():
     gw = py.execnet.PopenGateway()
     config = py.test.config._reparse([])
     channel = setup_slave(gw, pkgdir, config)
-    spec = rootcol.getitembynames(funcpass_spec).get_collector_trail()
+    spec = rootcol.getitembynames(funcpass_spec)._get_collector_trail()
     channel.send(spec)
     output = ReprOutcome(channel.receive())
     assert output.passed
diff --git a/py/test/rsession/testing/test_slave.py b/py/test/rsession/testing/test_slave.py
index ce1f6a7fc..62959d6c3 100644
--- a/py/test/rsession/testing/test_slave.py
+++ b/py/test/rsession/testing/test_slave.py
@@ -62,7 +62,7 @@ def gettestnode():
 def test_slave_run_passing():
     node = gettestnode()
     item = rootcol.getitembynames(funcpass_spec)
-    outcome = node.execute(item.get_collector_trail())
+    outcome = node.execute(item._get_collector_trail())
     assert outcome.passed 
     assert not outcome.setupfailure 
 
@@ -74,7 +74,7 @@ def test_slave_run_passing():
 def test_slave_run_failing():
     node = gettestnode()
     item = rootcol.getitembynames(funcfail_spec)
-    outcome = node.execute(item.get_collector_trail())
+    outcome = node.execute(item._get_collector_trail())
     assert not outcome.passed 
     assert not outcome.setupfailure 
     assert len(outcome.excinfo.traceback) == 1
@@ -89,7 +89,7 @@ def test_slave_run_failing():
 def test_slave_run_skipping():
     node = gettestnode()
     item = rootcol.getitembynames(funcskip_spec)    
-    outcome = node.execute(item.get_collector_trail())
+    outcome = node.execute(item._get_collector_trail())
     assert not outcome.passed
     assert outcome.skipped
 
@@ -101,7 +101,7 @@ def test_slave_run_skipping():
 def test_slave_run_failing_wrapped():
     node = gettestnode()
     item = rootcol.getitembynames(funcfail_spec)
-    repr_outcome = node.run(item.get_collector_trail()) 
+    repr_outcome = node.run(item._get_collector_trail()) 
     outcome = ReprOutcome(repr_outcome)  
     assert not outcome.passed 
     assert not outcome.setupfailure 
@@ -112,8 +112,8 @@ def test_slave_main_simple():
     failitem = rootcol.getitembynames(funcfail_spec)
     passitem = rootcol.getitembynames(funcpass_spec)
     q = [None, 
-         passitem.get_collector_trail(),
-         failitem.get_collector_trail()
+         passitem._get_collector_trail(),
+         failitem._get_collector_trail()
         ]
     config = py.test.config._reparse([])
     pidinfo = PidInfo()
@@ -125,7 +125,7 @@ def test_slave_main_simple():
 def test_slave_run_different_stuff():
     node = gettestnode()
     node.run(rootcol.getitembynames("py doc log.txt".split()).
-             get_collector_trail())
+             _get_collector_trail())
 
 def test_slave_setup_exit():
     tmp = py.test.ensuretemp("slaveexit")