From 0ba4bd25ac2c69211c55a37cafd16bd77785c96d Mon Sep 17 00:00:00 2001 From: hpk Date: Sat, 21 Mar 2009 20:58:41 +0100 Subject: [PATCH] [svn r63193] normalize towards 'iocapture' option --HG-- branch : trunk --- py/test/config.py | 4 ++-- py/test/defaultconftest.py | 2 -- py/test/dist/testing/test_functional_dsession.py | 2 +- py/test/plugin/pytest_default.py | 10 ++++++---- py/test/plugin/pytest_terminal.py | 4 ++-- py/test/testing/test_config.py | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/py/test/config.py b/py/test/config.py index 18c503008..f90687b0a 100644 --- a/py/test/config.py +++ b/py/test/config.py @@ -242,7 +242,7 @@ class Config(object): if self.option.nocapture: iocapture = "no" else: - iocapture = self.getvalue("conf_iocapture", path=path) + iocapture = self.getvalue("iocapture", path=path) if iocapture == "fd": return py.io.StdCaptureFD() elif iocapture == "sys": @@ -250,7 +250,7 @@ class Config(object): elif iocapture == "no": return py.io.StdCapture(out=False, err=False, in_=False) else: - raise ValueError("unknown io capturing: " + iocapture) + raise self.Error("unknown io capturing: " + iocapture) def getxspecs(self): config = self diff --git a/py/test/defaultconftest.py b/py/test/defaultconftest.py index a83eb41f4..06c62741c 100644 --- a/py/test/defaultconftest.py +++ b/py/test/defaultconftest.py @@ -8,14 +8,12 @@ Generator = py.test.collect.Generator Function = py.test.collect.Function Instance = py.test.collect.Instance -conf_iocapture = "fd" # overridable from conftest.py pytest_plugins = "default terminal xfail tmpdir execnetcleanup monkeypatch".split() # =================================================== # settings in conftest only (for now) - for distribution -dist_boxed = False if hasattr(py.std.os, 'nice'): dist_nicelevel = py.std.os.nice(0) # nice py.test works else: diff --git a/py/test/dist/testing/test_functional_dsession.py b/py/test/dist/testing/test_functional_dsession.py index 18853d701..5f8e05d92 100644 --- a/py/test/dist/testing/test_functional_dsession.py +++ b/py/test/dist/testing/test_functional_dsession.py @@ -68,7 +68,7 @@ class TestAsyncFunctional: "--tx=popen//chdir=%(dest)s" % locals(), p) assert result.ret == 0 result.stdout.fnmatch_lines([ - "*1* new *popen*platform*", + "*1* *popen*platform*", #"RSyncStart: [G1]", #"RSyncFinished: [G1]", "*1 passed*" diff --git a/py/test/plugin/pytest_default.py b/py/test/plugin/pytest_default.py index 94d6691bc..8e0a7475e 100644 --- a/py/test/plugin/pytest_default.py +++ b/py/test/plugin/pytest_default.py @@ -33,7 +33,7 @@ class DefaultPlugin: return Directory(path, parent=parent) def pytest_addoption(self, parser): - group = parser.addgroup("general", "test selection and failure debug options") + group = parser.addgroup("general", "general test process options") group._addoption('-v', '--verbose', action="count", dest="verbose", default=0, help="increase verbosity."), group._addoption('-x', '--exitfirst', @@ -61,9 +61,11 @@ class DefaultPlugin: group._addoption('--fulltrace', action="store_true", dest="fulltrace", default=False, help="don't cut any tracebacks (default is to cut).") - group._addoption('-s', '--nocapture', + group._addoption('-s', action="store_true", dest="nocapture", default=False, - help="disable catching of sys.stdout/stderr output."), + help="disable catching of stdout/stderr during test run.") + group._addoption('--iocapture', action="store", default="fd", metavar="method", + help="set iocapturing method: fd|sys|no.") group.addoption('--basetemp', dest="basetemp", default=None, metavar="dir", help="temporary directory for this test run.") group.addoption('--boxed', @@ -75,7 +77,7 @@ class DefaultPlugin: "and instantiate 'HelloPlugin' from the module.")) group._addoption('-f', '--looponfailing', action="store_true", dest="looponfailing", default=False, - help="loop on failing test set.") + help="run tests, loop on failing test set, until all pass. repeat forever.") group = parser.addgroup("test process debugging") group.addoption('--collectonly', diff --git a/py/test/plugin/pytest_terminal.py b/py/test/plugin/pytest_terminal.py index ded5a7fdf..91792c656 100644 --- a/py/test/plugin/pytest_terminal.py +++ b/py/test/plugin/pytest_terminal.py @@ -96,7 +96,7 @@ class TerminalReporter: else: d['extra'] = "" d['cwd'] = rinfo.cwd - self.write_line("%(id)s new %(spec)r -- platform %(platform)s, " + self.write_line("%(id)s %(spec)s -- platform %(platform)s, " "Python %(version)s " "cwd: %(cwd)s" "%(extra)s" % d) @@ -460,7 +460,7 @@ class TestTerminal: rep.pyevent_gwmanage_newgateway(gw1, rinfo) linecomp.assert_contains_lines([ - "X1 new 'popen' *xyz*2.5*" + "X1*popen*xyz*2.5*" ]) rep.pyevent_gwmanage_rsyncstart(source="hello", gateways=[gw1, gw2]) diff --git a/py/test/testing/test_config.py b/py/test/testing/test_config.py index 466eacd87..0637158de 100644 --- a/py/test/testing/test_config.py +++ b/py/test/testing/test_config.py @@ -236,13 +236,13 @@ class TestOptionEffects: def test_config_iocapturing(self, testdir): config = testdir.parseconfig(testdir.tmpdir) - assert config.getvalue("conf_iocapture") + assert config.getvalue("iocapture") tmpdir = testdir.tmpdir.ensure("sub-with-conftest", dir=1) tmpdir.join("conftest.py").write(py.code.Source(""" - conf_iocapture = "no" + pytest_option_iocapture = "no" """)) config = py.test.config._reparse([tmpdir]) - assert config.getvalue("conf_iocapture") == "no" + assert config.getvalue("iocapture") == "no" capture = config._getcapture() assert isinstance(capture, py.io.StdCapture) assert not capture._out @@ -252,7 +252,7 @@ class TestOptionEffects: for opt, cls in (("sys", py.io.StdCapture), ("fd", py.io.StdCaptureFD), ): - config.option.conf_iocapture = opt + config.option.iocapture = opt capture = config._getcapture() assert isinstance(capture, cls)