[py-svn] py-trunk commit 7b9a4fa15994: move rsync reporting out
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Jan 18 02:08:13 CET 2010
# HG changeset patch -- Bitbucket.org
# Project py-trunk
# URL http://bitbucket.org/hpk42/py-trunk/overview/
# User holger krekel <holger at merlinux.eu>
# Date 1263771682 -3600
# Node ID 7b9a4fa15994011c40abb523311b20dc0777075c
# Parent 772fad27192b7aa96581e61766c84e96929afffd
move rsync reporting out
--- a/testing/plugin/test_pytest_terminal.py
+++ b/testing/plugin/test_pytest_terminal.py
@@ -100,40 +100,6 @@ class TestTerminal:
"INTERNALERROR> *raise ValueError*"
])
- def test_gwmanage_events(self, testdir, linecomp):
- execnet = py.test.importorskip("execnet")
- modcol = testdir.getmodulecol("""
- def test_one():
- pass
- """, configargs=("-v",))
-
- rep = TerminalReporter(modcol.config, file=linecomp.stringio)
- class gw1:
- id = "X1"
- spec = execnet.XSpec("popen")
- class gw2:
- id = "X2"
- spec = execnet.XSpec("popen")
- class rinfo:
- version_info = (2, 5, 1, 'final', 0)
- executable = "hello"
- platform = "xyz"
- cwd = "qwe"
-
- rep.pytest_gwmanage_newgateway(gw1, rinfo)
- linecomp.assert_contains_lines([
- "*X1*popen*xyz*2.5*"
- ])
-
- rep.pytest_gwmanage_rsyncstart(source="hello", gateways=[gw1, gw2])
- linecomp.assert_contains_lines([
- "rsyncstart: hello -> [X1], [X2]"
- ])
- rep.pytest_gwmanage_rsyncfinish(source="hello", gateways=[gw1, gw2])
- linecomp.assert_contains_lines([
- "rsyncfinish: hello -> [X1], [X2]"
- ])
-
def test_writeline(self, testdir, linecomp):
modcol = testdir.getmodulecol("def test_one(): pass")
stringio = py.io.TextIO()
--- a/py/_plugin/pytest_terminal.py
+++ b/py/_plugin/pytest_terminal.py
@@ -143,17 +143,6 @@ class TerminalReporter:
self.write_line(infoline)
self.gateway2info[gateway] = infoline
- def pytest_gwmanage_rsyncstart(self, source, gateways):
- targets = ", ".join(["[%s]" % gw.id for gw in gateways])
- msg = "rsyncstart: %s -> %s" %(source, targets)
- if not self.config.option.verbose:
- msg += " # use --verbose to see rsync progress"
- self.write_line(msg)
-
- def pytest_gwmanage_rsyncfinish(self, source, gateways):
- targets = ", ".join(["[%s]" % gw.id for gw in gateways])
- self.write_line("rsyncfinish: %s -> %s" %(source, targets))
-
def pytest_plugin_registered(self, plugin):
if self.config.option.traceconfig:
msg = "PLUGIN registered: %s" %(plugin,)
More information about the pytest-commit
mailing list