[py-svn] r36900 - in py/branch/conftest/py: doc doc/example/pytest test test/rsession test/rsession/testing test/terminal test/testing test/tkinter test/tkinter/testing
hpk at codespeak.net
hpk at codespeak.net
Thu Jan 18 07:18:26 CET 2007
Author: hpk
Date: Thu Jan 18 07:18:23 2007
New Revision: 36900
Modified:
py/branch/conftest/py/doc/example/pytest/test_failures.py
py/branch/conftest/py/doc/test_conftest.py
py/branch/conftest/py/test/config.py
py/branch/conftest/py/test/rsession/rsession.py
py/branch/conftest/py/test/rsession/testing/test_config.py
py/branch/conftest/py/test/rsession/testing/test_lsession.py
py/branch/conftest/py/test/rsession/testing/test_master.py
py/branch/conftest/py/test/rsession/testing/test_reporter.py
py/branch/conftest/py/test/rsession/testing/test_rest.py
py/branch/conftest/py/test/rsession/testing/test_rsession.py
py/branch/conftest/py/test/rsession/testing/test_slave.py
py/branch/conftest/py/test/rsession/testing/test_web.py
py/branch/conftest/py/test/rsession/testing/test_webjs.py
py/branch/conftest/py/test/terminal/remote.py
py/branch/conftest/py/test/testing/test_collect.py
py/branch/conftest/py/test/testing/test_config.py
py/branch/conftest/py/test/testing/test_session.py
py/branch/conftest/py/test/tkinter/backend.py
py/branch/conftest/py/test/tkinter/testing/test_backend.py
py/branch/conftest/py/test/tkinter/testing/test_capture_out_err.py
Log:
config._reparse() only returns a config object now
(and config.remaining contains the command line arguments)
-> fixing various occassions of redundancy
Modified: py/branch/conftest/py/doc/example/pytest/test_failures.py
==============================================================================
--- py/branch/conftest/py/doc/example/pytest/test_failures.py (original)
+++ py/branch/conftest/py/doc/example/pytest/test_failures.py Thu Jan 18 07:18:23 2007
@@ -3,7 +3,7 @@
failure_demo = py.magic.autopath().dirpath('failure_demo.py')
def test_failure_demo_fails_properly():
- config, args = py.test.config._reparse([failure_demo])
+ config = py.test.config._reparse([failure_demo])
session = config.getsessionclass()(config, py.std.sys.stdout)
session.main()
l = session.getitemoutcomepairs(py.test.Item.Failed)
Modified: py/branch/conftest/py/doc/test_conftest.py
==============================================================================
--- py/branch/conftest/py/doc/test_conftest.py (original)
+++ py/branch/conftest/py/doc/test_conftest.py Thu Jan 18 07:18:23 2007
@@ -28,7 +28,7 @@
end
"""))
- config, args = py.test.config._reparse([xtxt])
+ config = py.test.config._reparse([xtxt])
session = config.getsessionclass()(config, py.std.sys.stdout)
session.main()
l = session.getitemoutcomepairs(py.test.Item.Failed)
@@ -46,7 +46,7 @@
.. _`blah`: javascript:some_function()
"""))
- config, args = py.test.config._reparse([xtxt])
+ config = py.test.config._reparse([xtxt])
session = config.getsessionclass()(config, py.std.sys.stdout)
session.main()
l = session.getitemoutcomepairs(py.test.Item.Failed)
Modified: py/branch/conftest/py/test/config.py
==============================================================================
--- py/branch/conftest/py/test/config.py (original)
+++ py/branch/conftest/py/test/config.py Thu Jan 18 07:18:23 2007
@@ -93,7 +93,7 @@
try:
config = py.test.config = Config()
config.parse(args)
- return config, config.remaining
+ return config
finally:
config = py.test.config = oldconfig
Modified: py/branch/conftest/py/test/rsession/rsession.py
==============================================================================
--- py/branch/conftest/py/test/rsession/rsession.py (original)
+++ py/branch/conftest/py/test/rsession/rsession.py Thu Jan 18 07:18:23 2007
@@ -245,11 +245,9 @@
class LSession(AbstractSession):
""" Local version of session
"""
- def main(self, args, reporter=None, runner=None):
+ def main(self, reporter=None, runner=None):
# check out if used options makes any sense
-
- if not args:
- args = [py.path.local()]
+ args = self.config.remaining
sshhosts = [HostInfo('localhost')] # this is just an info to reporter
Modified: py/branch/conftest/py/test/rsession/testing/test_config.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_config.py (original)
+++ py/branch/conftest/py/test/rsession/testing/test_config.py Thu Jan 18 07:18:23 2007
@@ -14,11 +14,11 @@
""")
tmp2 = py.test.ensuretemp("xxx")
args = [str(tmpdir)]
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
session_options.bind_config(config)
assert session_options.max_tasks_per_node == 5
assert remote_options.nice_level == 10
- config, args = py.test.config._reparse([str(tmp2)])
+ config = py.test.config._reparse([str(tmp2)])
session_options.bind_config(config)
assert session_options.max_tasks_per_node == \
SessionOptions.defaults['max_tasks_per_node']
Modified: py/branch/conftest/py/test/rsession/testing/test_lsession.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_lsession.py (original)
+++ py/branch/conftest/py/test/rsession/testing/test_lsession.py Thu Jan 18 07:18:23 2007
@@ -32,10 +32,10 @@
# os.kill(os.getpid(), 11)
"""))
args = [str(tmpdir.join(dirname))]
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
lsession = LSession(config)
allevents = []
- lsession.main(args, reporter=allevents.append, runner=runner)
+ lsession.main(reporter=allevents.append, runner=runner)
testevents = [x for x in allevents
if isinstance(x, report.ReceivedItemOutcome)]
assert len(testevents)
@@ -85,11 +85,11 @@
pdb.post_mortem = some_fun
args = [str(tmpdir.join(subdir)), '--pdb']
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
lsession = LSession(config)
allevents = []
try:
- lsession.main(args, reporter=allevents.append, runner=plain_runner)
+ lsession.main(reporter=allevents.append, runner=plain_runner)
except SystemExit:
pass
else:
@@ -116,12 +116,12 @@
pass
"""))
args = [str(tmpdir.join(subdir)), '-x']
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
assert config.option.exitfirst
lsession = LSession(config)
allevents = []
- lsession.main(args, reporter=allevents.append, runner=box_runner)
+ lsession.main(reporter=allevents.append, runner=box_runner)
testevents = [x for x in allevents
if isinstance(x, report.ReceivedItemOutcome)]
assert len(testevents)
@@ -146,11 +146,11 @@
pass
"""))
args = [str(tmpdir.join("sub3")), '-k', 'test_one']
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
lsession = LSession(config)
allevents = []
- lsession.main(args, reporter=allevents.append, runner=box_runner)
+ lsession.main(reporter=allevents.append, runner=box_runner)
testevents = [x for x in allevents
if isinstance(x, report.ReceivedItemOutcome)]
assert len(testevents)
@@ -174,7 +174,7 @@
"""))
args = [str(tmpdir.join("sub4"))]
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
lsession = LSession(config)
allevents = []
allruns = []
@@ -182,7 +182,7 @@
allruns.append(item)
item.passed = True
return item
- lsession.main(args, reporter=allevents.append, runner=dummy_runner)
+ lsession.main(reporter=allevents.append, runner=dummy_runner)
assert len(allruns) == 4
testevents = [x for x in allevents
@@ -205,10 +205,10 @@
"""))
args = [str(tmpdir.join("sub5"))]
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
lsession = LSession(config)
allevents = []
- lsession.main(args, reporter=allevents.append, runner=box_runner)
+ lsession.main(reporter=allevents.append, runner=box_runner)
testevents = [x for x in allevents
if isinstance(x, report.ReceivedItemOutcome)]
assert len(testevents) == 0
@@ -231,10 +231,10 @@
assert [0] == x
"""))
args = [str(tmpdir.join("sub6"))]
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
lsession = LSession(config)
allevents = []
- lsession.main(args, reporter=allevents.append, runner=box_runner)
+ lsession.main(reporter=allevents.append, runner=box_runner)
testevents = [x for x in allevents
if isinstance(x, report.ReceivedItemOutcome)]
failevents = [i for i in testevents if i.outcome.excinfo]
@@ -252,10 +252,10 @@
print 3
"""))
args = [str(tmpdir.join("sub7"))]
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
lsession = LSession(config)
allevents = []
- lsession.main(args, reporter=allevents.append, runner=plain_runner)
+ lsession.main(reporter=allevents.append, runner=plain_runner)
testevents = [x for x in allevents
if isinstance(x, report.ReceivedItemOutcome)]
assert len(testevents) == 1
Modified: py/branch/conftest/py/test/rsession/testing/test_master.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_master.py (original)
+++ py/branch/conftest/py/test/rsession/testing/test_master.py Thu Jan 18 07:18:23 2007
@@ -18,7 +18,7 @@
def setup_module(mod):
# bind an empty config
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([])
config.option.max_tasks_per_node = 10
session_options.bind_config(config)
#assert not remote_options.exitfirst
Modified: py/branch/conftest/py/test/rsession/testing/test_reporter.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_reporter.py (original)
+++ py/branch/conftest/py/test/rsession/testing/test_reporter.py Thu Jan 18 07:18:23 2007
@@ -61,7 +61,7 @@
return outcomes
def report_received_item_outcome(self):
- config, args = py.test.config._reparse(["some_sub"])
+ config = py.test.config._reparse(["some_sub"])
# we just go...
rootcol = py.test.collect.Directory(self.pkgdir.dirpath())
item = rootcol.getitembynames(funcpass_spec)
@@ -81,7 +81,7 @@
return out
def _test_module(self):
- config, args = py.test.config._reparse(["some_sub"])
+ config = py.test.config._reparse(["some_sub"])
# we just go...
rootcol = py.test.collect.Directory(self.pkgdir.dirpath())
funcitem = rootcol.getitembynames(funcpass_spec)
@@ -119,7 +119,7 @@
"""))
def boxfun():
- config, args = py.test.config._reparse([str(tmpdir)])
+ config = py.test.config._reparse([str(tmpdir)])
rootcol = py.test.collect.Directory(tmpdir)
hosts = [HostInfo('localhost')]
r = self.reporter(config, hosts)
@@ -138,7 +138,7 @@
sadsadsa
"""))
def boxfun():
- config, args = py.test.config._reparse([str(tmpdir)])
+ config = py.test.config._reparse([str(tmpdir)])
rootcol = py.test.collect.Directory(tmpdir)
host = HostInfo('localhost')
r = self.reporter(config, [host])
@@ -157,7 +157,7 @@
tmpdir = py.test.ensuretemp("stilltogo")
tmpdir.ensure("__init__.py")
cap = py.io.OutErrCapture()
- config, args = py.test.config._reparse([str(tmpdir)])
+ config = py.test.config._reparse([str(tmpdir)])
hosts = [HostInfo(i) for i in ["host1", "host2", "host3"]]
r = self.reporter(config, hosts)
r.report(report.TestStarted(hosts))
Modified: py/branch/conftest/py/test/rsession/testing/test_rest.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_rest.py (original)
+++ py/branch/conftest/py/test/rsession/testing/test_rest.py Thu Jan 18 07:18:23 2007
@@ -27,7 +27,7 @@
class TestRestUnits(object):
def setup_method(self, method):
- config, args = py.test.config._reparse(["some_sub"])
+ config = py.test.config._reparse(["some_sub"])
config.option.verbose = False
self.config = config
hosts = [HostInfo('localhost')]
Modified: py/branch/conftest/py/test/rsession/testing/test_rsession.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_rsession.py (original)
+++ py/branch/conftest/py/test/rsession/testing/test_rsession.py Thu Jan 18 07:18:23 2007
@@ -91,7 +91,7 @@
pass
"""))
args = [str(tmpdir.join("sub")), "-x"]
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
rsession = RSession(config)
allevents = []
rsession.main(reporter=allevents.append)
@@ -121,7 +121,7 @@
assert __file__ != '%s'
""" % str(tmpdir.join(subdir))))
args = [str(tmpdir.join(subdir))]
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
rsession = RSession(config, optimise_localhost=False)
allevents = []
rsession.main(reporter=allevents.append)
@@ -154,7 +154,7 @@
setup_events = []
teardown_events = []
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([])
session_options.bind_config(config)
nodes = init_hosts(setup_events.append, hosts, pkgdir,
rsync_roots=["py"], optimise_localhost=False, remote_options=remote_options.d)
@@ -181,7 +181,7 @@
parse_directories(hosts)
allevents = []
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([])
session_options.bind_config(config)
nodes = init_hosts(allevents.append, hosts, pkgdir,
rsync_roots=["py"], optimise_localhost=False, remote_options=remote_options.d)
@@ -223,7 +223,7 @@
allevents = []
hosts = [HostInfo('localhost')]
parse_directories(hosts)
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([])
session_options.bind_config(config)
d = remote_options.d.copy()
d['custom'] = 'custom'
@@ -264,7 +264,7 @@
assert os.nice(0) == 10
""")
- config, args = py.test.config._reparse([tmpdir])
+ config = py.test.config._reparse([tmpdir])
config.option.nice_level = 10
rsession = RSession(config)
allevents = []
Modified: py/branch/conftest/py/test/rsession/testing/test_slave.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_slave.py (original)
+++ py/branch/conftest/py/test/rsession/testing/test_slave.py Thu Jan 18 07:18:23 2007
@@ -13,7 +13,7 @@
def setup_module(module):
from py.__.test.rsession.rsession import session_options
module.rootdir = py.path.local(py.__file__).dirpath().dirpath()
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([])
session_options.bind_config(config)
# ----------------------------------------------------------------------
Modified: py/branch/conftest/py/test/rsession/testing/test_web.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_web.py (original)
+++ py/branch/conftest/py/test/rsession/testing/test_web.py Thu Jan 18 07:18:23 2007
@@ -13,7 +13,7 @@
py.test.skip("PyPy not found")
def setup_module(mod):
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([])
from py.__.test.rsession.rsession import session_options
session_options.bind_config(config)
session_options.import_pypy = True
Modified: py/branch/conftest/py/test/rsession/testing/test_webjs.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_webjs.py (original)
+++ py/branch/conftest/py/test/rsession/testing/test_webjs.py Thu Jan 18 07:18:23 2007
@@ -15,7 +15,7 @@
mod.dom = dom
dom.window = dom.Window(html)
dom.document = dom.window.document
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([])
from py.__.test.rsession.rsession import session_options
session_options.bind_config(config)
session_options.import_pypy = True
Modified: py/branch/conftest/py/test/terminal/remote.py
==============================================================================
--- py/branch/conftest/py/test/terminal/remote.py (original)
+++ py/branch/conftest/py/test/terminal/remote.py Thu Jan 18 07:18:23 2007
@@ -53,7 +53,7 @@
def failure_slave(channel):
""" we run this on the other side. """
args, failures = channel.receive()
- config, args = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
# making this session definitely non-remote
config.option.executable = py.std.sys.executable
config.option.looponfailing = False
Modified: py/branch/conftest/py/test/testing/test_collect.py
==============================================================================
--- py/branch/conftest/py/test/testing/test_collect.py (original)
+++ py/branch/conftest/py/test/testing/test_collect.py Thu Jan 18 07:18:23 2007
@@ -213,7 +213,7 @@
# test that running a session works from the directories
old = o.chdir()
try:
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([])
out = py.std.cStringIO.StringIO()
session = config.getsessionclass()(config, out)
session.main()
@@ -223,7 +223,7 @@
old.chdir()
# test that running the file directly works
- config, args = py.test.config._reparse([str(checkfile)])
+ config = py.test.config._reparse([str(checkfile)])
out = py.std.cStringIO.StringIO()
session = config.getsessionclass()(config, out)
session.main()
@@ -260,7 +260,7 @@
# test that running a session works from the directories
old = o.chdir()
try:
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([])
out = py.std.cStringIO.StringIO()
session = config.getsessionclass()(config, out)
session.main()
@@ -270,7 +270,7 @@
old.chdir()
# test that running the file directly works
- config, args = py.test.config._reparse([str(checkfile)])
+ config = py.test.config._reparse([str(checkfile)])
out = py.std.cStringIO.StringIO()
session = config.getsessionclass()(config, out)
session.main()
Modified: py/branch/conftest/py/test/testing/test_config.py
==============================================================================
--- py/branch/conftest/py/test/testing/test_config.py (original)
+++ py/branch/conftest/py/test/testing/test_config.py Thu Jan 18 07:18:23 2007
@@ -24,25 +24,25 @@
"""))
old = o.chdir()
try:
- config, args = py.test.config._reparse(['-g', '17'])
+ config = py.test.config._reparse(['-g', '17'])
finally:
old.chdir()
assert config.option.gdest == 17
def test_parsing_again_fails():
dir = py.test.ensuretemp("parsing_again_fails")
- config, args = py.test.config._reparse([str(dir)])
+ config = py.test.config._reparse([str(dir)])
py.test.raises(AssertionError, "config.parse([])")
def test_config_getvalue_honours_conftest():
o = py.test.ensuretemp('testconfigget')
o.ensure("conftest.py").write("x=1")
o.ensure("sub", "conftest.py").write("x=2 ; y = 3")
- config, args = py.test.config._reparse([str(o)])
+ config = py.test.config._reparse([str(o)])
assert config.getvalue("x") == 1
assert config.getvalue("x", o.join('sub')) == 2
py.test.raises(KeyError, "config.getvalue('y')")
- config, args = py.test.config._reparse([str(o.join('sub'))])
+ config = py.test.config._reparse([str(o.join('sub'))])
assert config.getvalue("x") == 2
assert config.getvalue("y") == 3
assert config.getvalue("x", o) == 1
Modified: py/branch/conftest/py/test/testing/test_session.py
==============================================================================
--- py/branch/conftest/py/test/testing/test_session.py (original)
+++ py/branch/conftest/py/test/testing/test_session.py Thu Jan 18 07:18:23 2007
@@ -7,7 +7,7 @@
class TestDefaultSession:
def test_simple(self):
- config, args = py.test.config._reparse([datadir/'filetest.py'])
+ config = py.test.config._reparse([datadir/'filetest.py'])
session = config.getsessionclass()(config, py.std.sys.stdout)
session.main()
l = session.getitemoutcomepairs(py.test.Item.Failed)
@@ -16,7 +16,7 @@
assert not l
def test_simple_verbose(self):
- config, args = py.test.config._reparse([datadir/'filetest.py',
+ config = py.test.config._reparse([datadir/'filetest.py',
'--verbose'])
session = config.getsessionclass()(config, py.std.sys.stdout)
session.main()
@@ -26,7 +26,7 @@
assert not l
def test_simple_verbose_verbose(self):
- config, args = py.test.config._reparse([datadir/'filetest.py',
+ config = py.test.config._reparse([datadir/'filetest.py',
'-v', '-v'])
session = config.getsessionclass()(config, py.std.sys.stdout)
session.main()
@@ -38,17 +38,17 @@
def test_session_parsing(self):
from py.__.test.terminal.terminal import TerminalSession
from py.__.test.tkinter.reportsession import ReportSession
- config, args = py.test.config._reparse(['--session=terminal'])
+ config = py.test.config._reparse(['--session=terminal'])
assert issubclass(config.getsessionclass(), TerminalSession)
- config, args = py.test.config._reparse(['--session=tkinter'])
+ config = py.test.config._reparse(['--session=tkinter'])
assert issubclass(config.getsessionclass(), ReportSession)
- config, args = py.test.config._reparse(['--tkinter'])
+ config = py.test.config._reparse(['--tkinter'])
assert issubclass(config.getsessionclass(), ReportSession)
class TestKeywordSelection:
def test_select_simple(self):
for keyword in ['test_one', 'est_on']:
- config, args = py.test.config._reparse([datadir/'filetest.py',
+ config = py.test.config._reparse([datadir/'filetest.py',
'-k', keyword])
session = config.getsessionclass()(config, py.std.sys.stdout)
session.main()
@@ -78,7 +78,7 @@
for keyword in ('xxx', 'xxx test_2', 'TestClass', 'xxx -test_1',
'TestClass test_2', 'xxx TestClass test_2',):
f = py.std.StringIO.StringIO()
- config, args = py.test.config._reparse([o, '-k', keyword])
+ config = py.test.config._reparse([o, '-k', keyword])
session = config.getsessionclass()(config, f)
session.main()
print "keyword", repr(keyword)
@@ -100,7 +100,7 @@
def mainsession(self, *args):
from py.__.test.terminal.terminal import TerminalSession
self.file = py.std.StringIO.StringIO()
- config, args = py.test.config._reparse(list(args))
+ config = py.test.config._reparse(list(args))
session = TerminalSession(config, file=self.file)
session.main()
return session
@@ -345,7 +345,7 @@
assert 1 == 0
"""))
print py.std.sys.executable
- config, args = py.test.config._reparse(
+ config = py.test.config._reparse(
['--exec=' + py.std.sys.executable,
o])
assert config.option._remote
@@ -367,7 +367,7 @@
assert 1 == 0
"""))
print py.std.sys.executable
- config, args = py.test.config._reparse(['--looponfailing', str(o)])
+ config = py.test.config._reparse(['--looponfailing', str(o)])
assert config.option._remote
cls = config.getsessionclass()
out = py.std.Queue.Queue()
Modified: py/branch/conftest/py/test/tkinter/backend.py
==============================================================================
--- py/branch/conftest/py/test/tkinter/backend.py (original)
+++ py/branch/conftest/py/test/tkinter/backend.py Thu Jan 18 07:18:23 2007
@@ -229,11 +229,11 @@
from py.__.test.tkinter.reportsession import ReportSession
from py.__.test.terminal.remote import getfailureitems
- config, testfiles = py.test.config._reparse(args)
+ config = py.test.config._reparse(args)
if tests:
cols = getfailureitems(tests)
else:
- cols = testfiles
+ cols = config.remaining
session = ReportSession(config = config, channel=channel)
session.shouldclose = channel.isclosed
session.main()
Modified: py/branch/conftest/py/test/tkinter/testing/test_backend.py
==============================================================================
--- py/branch/conftest/py/test/tkinter/testing/test_backend.py (original)
+++ py/branch/conftest/py/test/tkinter/testing/test_backend.py Thu Jan 18 07:18:23 2007
@@ -178,7 +178,7 @@
assert l[0] is None
def test_start_tests(self):
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([])
self.backend.start_tests(config = config,
args = [str(datadir / 'filetest.py')],
tests = [])
Modified: py/branch/conftest/py/test/tkinter/testing/test_capture_out_err.py
==============================================================================
--- py/branch/conftest/py/test/tkinter/testing/test_capture_out_err.py (original)
+++ py/branch/conftest/py/test/tkinter/testing/test_capture_out_err.py Thu Jan 18 07:18:23 2007
@@ -5,10 +5,10 @@
datadir = py.magic.autopath().dirpath('data')
def test_capture_out_err():
- config, args = py.test.config._reparse([])
+ config = py.test.config._reparse([datadir/'filetest.py'])
backend = ReportBackend()
backend.start_tests(config = config,
- args = [str(datadir / 'filetest.py')],
+ args = config.remaining,
tests = [])
while backend.running:
backend.update()
More information about the pytest-commit
mailing list