[py-svn] r37876 - in py/trunk/py: doc test test/rsession test/rsession/testing

[fijal at codespeak.net]

Author: fijal
Date: Sat Feb  3 19:00:04 2007
New Revision: 37876

Modified:
   py/trunk/py/doc/TODO.txt
   py/trunk/py/test/collect.py
   py/trunk/py/test/rsession/master.py
   py/trunk/py/test/rsession/testing/test_master.py
   py/trunk/py/test/rsession/testing/test_slave.py
Log:
s/get_collector_trail/_get_collector_trail/


Modified: py/trunk/py/doc/TODO.txt
==============================================================================
--- py/trunk/py/doc/TODO.txt	(original)
+++ py/trunk/py/doc/TODO.txt	Sat Feb  3 19:00:04 2007
@@ -81,7 +81,7 @@
 * 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()

Modified: py/trunk/py/test/collect.py
==============================================================================
--- py/trunk/py/test/collect.py	(original)
+++ py/trunk/py/test/collect.py	Sat Feb  3 19:00:04 2007
@@ -231,7 +231,7 @@
     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)

Modified: py/trunk/py/test/rsession/master.py
==============================================================================
--- py/trunk/py/test/rsession/master.py	(original)
+++ py/trunk/py/test/rsession/master.py	Sat Feb  3 19:00:04 2007
@@ -30,7 +30,7 @@
         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))
 

Modified: py/trunk/py/test/rsession/testing/test_master.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_master.py	(original)
+++ py/trunk/py/test/rsession/testing/test_master.py	Sat Feb  3 19:00:04 2007
@@ -39,7 +39,7 @@
         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 @@
     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

Modified: py/trunk/py/test/rsession/testing/test_slave.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_slave.py	(original)
+++ py/trunk/py/test/rsession/testing/test_slave.py	Sat Feb  3 19:00:04 2007
@@ -62,7 +62,7 @@
 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_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_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_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 @@
     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_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")