p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r37876] s/get_collector_trail/_get_collector_trail/ 

--HG--
branch : trunk
This commit is contained in:
fijal 2007-02-03 19:00:04 +01:00
parent 9f8035656e
commit 46a91b3705
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/doc/TODO.txt
View File

@ -81,7 +81,7 @@ APIGEN / source viewer
* private py.test not-meant-to-be-public API: * private py.test not-meant-to-be-public API:
here is a rough list what we want public on collectors: here is a rough list what we want public on collectors:
py.test.Collector. py.test.collect.Collector.
startcapture() startcapture()
finishcapture() finishcapture()
setup() setup()

2
py/test/collect.py
View File

@ -231,7 +231,7 @@ class Collector(object):
def getouterr(self): def getouterr(self):
return self.captured_out, self.captured_err return self.captured_out, self.captured_err
def get_collector_trail(self): def _get_collector_trail(self):
""" Shortcut """ Shortcut
""" """
return self.config.get_collector_trail(self) return self.config.get_collector_trail(self)

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.get_collector_trail()) 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))

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

@ -39,7 +39,7 @@ class DummyChannel(object):
self.sent.append(item) self.sent.append(item)
class Item(py.test.Item): class Item(py.test.Item):
def get_collector_trail(self): def _get_collector_trail(self):
return (self.name,) return (self.name,)
def test_masternode(): def test_masternode():
@ -96,7 +96,7 @@ def test_slave_setup():
gw = py.execnet.PopenGateway() gw = py.execnet.PopenGateway()
config = py.test.config._reparse([]) config = py.test.config._reparse([])
channel = setup_slave(gw, pkgdir, config) 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) channel.send(spec)
output = ReprOutcome(channel.receive()) output = ReprOutcome(channel.receive())
assert output.passed assert output.passed

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

@ -62,7 +62,7 @@ def gettestnode():
def test_slave_run_passing(): def test_slave_run_passing():
node = gettestnode() node = gettestnode()
item = rootcol.getitembynames(funcpass_spec) item = rootcol.getitembynames(funcpass_spec)
outcome = node.execute(item.get_collector_trail()) outcome = node.execute(item._get_collector_trail())
assert outcome.passed assert outcome.passed
assert not outcome.setupfailure assert not outcome.setupfailure
@ -74,7 +74,7 @@ def test_slave_run_passing():
def test_slave_run_failing(): def test_slave_run_failing():
node = gettestnode() node = gettestnode()
item = rootcol.getitembynames(funcfail_spec) 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.passed
assert not outcome.setupfailure assert not outcome.setupfailure
assert len(outcome.excinfo.traceback) == 1 assert len(outcome.excinfo.traceback) == 1
@ -89,7 +89,7 @@ def test_slave_run_failing():
def test_slave_run_skipping(): def test_slave_run_skipping():
node = gettestnode() node = gettestnode()
item = rootcol.getitembynames(funcskip_spec) item = rootcol.getitembynames(funcskip_spec)
outcome = node.execute(item.get_collector_trail()) outcome = node.execute(item._get_collector_trail())
assert not outcome.passed assert not outcome.passed
assert outcome.skipped assert outcome.skipped
@ -101,7 +101,7 @@ def test_slave_run_skipping():
def test_slave_run_failing_wrapped(): def test_slave_run_failing_wrapped():
node = gettestnode() node = gettestnode()
item = rootcol.getitembynames(funcfail_spec) 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) outcome = ReprOutcome(repr_outcome)
assert not outcome.passed assert not outcome.passed
assert not outcome.setupfailure assert not outcome.setupfailure
@ -112,8 +112,8 @@ def test_slave_main_simple():
failitem = rootcol.getitembynames(funcfail_spec) failitem = rootcol.getitembynames(funcfail_spec)
passitem = rootcol.getitembynames(funcpass_spec) passitem = rootcol.getitembynames(funcpass_spec)
q = [None, q = [None,
passitem.get_collector_trail(), passitem._get_collector_trail(),
failitem.get_collector_trail() failitem._get_collector_trail()
] ]
config = py.test.config._reparse([]) config = py.test.config._reparse([])
pidinfo = PidInfo() pidinfo = PidInfo()
@ -125,7 +125,7 @@ def test_slave_main_simple():
def test_slave_run_different_stuff(): def test_slave_run_different_stuff():
node = gettestnode() node = gettestnode()
node.run(rootcol.getitembynames("py doc log.txt".split()). node.run(rootcol.getitembynames("py doc log.txt".split()).
get_collector_trail()) _get_collector_trail())
def test_slave_setup_exit(): def test_slave_setup_exit():
tmp = py.test.ensuretemp("slaveexit") tmp = py.test.ensuretemp("slaveexit")