[py-svn] r37411 - in py/trunk/py/test/rsession: . testing
fijal at codespeak.net
fijal at codespeak.net
Fri Jan 26 23:35:35 CET 2007
Author: fijal
Date: Fri Jan 26 23:35:20 2007
New Revision: 37411
Modified:
py/trunk/py/test/rsession/rest.py
py/trunk/py/test/rsession/testing/test_rest.py
Log:
Fix a bit rest and test_rest. Note that actually these tests are
testing anything from time to time, need closer look.
Modified: py/trunk/py/test/rsession/rest.py
==============================================================================
--- py/trunk/py/test/rsession/rest.py (original)
+++ py/trunk/py/test/rsession/rest.py Fri Jan 26 23:35:20 2007
@@ -37,20 +37,21 @@
return self.hosts[0]
def report_SendItem(self, item):
- address = self.gethost(item)
+ address = self.gethost(item).hostname
if self.config.option.verbose:
self.add_rest(Paragraph('sending item %s to %s' % (item.item,
address)))
def report_HostRSyncing(self, item):
self.add_rest(LiteralBlock('%10s: RSYNC ==> %s' % (item.host.hostname[:10],
- item.remoterootpath)))
+ item.host.relpath)))
def report_HostReady(self, item):
self.add_rest(LiteralBlock('%10s: READY' % (item.host.hostname[:10],)))
def report_TestStarted(self, event):
- txt = "Running tests on hosts: %s" % ", ".join(event.hosts)
+ txt = "Running tests on hosts: %s" % ", ".join([i.hostname for i in
+ event.hosts])
self.add_rest(Title(txt, abovechar='=', belowchar='='))
self.timestart = event.timestart
Modified: py/trunk/py/test/rsession/testing/test_rest.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_rest.py (original)
+++ py/trunk/py/test/rsession/testing/test_rest.py Fri Jan 26 23:35:20 2007
@@ -9,24 +9,13 @@
from py.__.test.rsession.rest import RestReporter, NoLinkWriter
from py.__.rest.rst import *
from py.__.test.rsession.hostmanage import HostInfo
-
-py.test.skip("This tests are not really testing, needs rewrite")
+from py.__.test.rsession.outcome import Outcome
class RestTestReporter(RestReporter):
def __init__(self, *args, **kwargs):
if args:
super(RestReporter, self).__init__(*args, **kwargs)
-class Container(object):
- def __init__(self, **kwargs):
- self.__dict__.update(kwargs)
-
-class FakeOutcome(Container, report.ReceivedItemOutcome):
- pass
-
-class FakeTryiter(Container, report.SkippedTryiter):
- pass
-
class TestRestUnits(object):
def setup_method(self, method):
config = py.test.config._reparse(["some_sub"])
@@ -47,30 +36,31 @@
self.config.option.verbose = False
def test_report_SendItem(self):
- item = Container(item='foo/bar.py', channel=ch)
- reporter.report_SendItem(item)
+ event = report.SendItem(item='foo/bar.py', channel=ch)
+ reporter.report(event)
assert stdout.getvalue() == ''
stdout.seek(0)
stdout.truncate()
reporter.config.option.verbose = True
- reporter.report_SendItem(item)
+ reporter.report(event)
assert stdout.getvalue() == ('sending item foo/bar.py to '
'localhost\n\n')
def test_report_HostRSyncing(self):
- item = Container(hostname='localhost', remoterootpath='/foo/bar')
- reporter.report_HostRSyncing(item)
+ event = report.HostRSyncing(HostInfo('localhost', '/foo/bar'))
+ reporter.report(event)
assert stdout.getvalue() == ('::\n\n localhost: RSYNC ==> '
'/foo/bar\n\n')
def test_report_HostReady(self):
- item = Container(hostname='localhost')
- reporter.report_HostReady(item)
+ event = report.HostReady(HostInfo('localhost'))
+ reporter.report(event)
assert stdout.getvalue() == '::\n\n localhost: READY\n\n'
def test_report_TestStarted(self):
- event = Container(hosts=['localhost', 'foo.com'], timestart=0)
- reporter.report_TestStarted(event)
+ event = report.TestStarted(hosts=[HostInfo('localhost'),
+ HostInfo('foo.com')])
+ reporter.report(event)
assert stdout.getvalue() == """\
===========================================
Running tests on hosts\: localhost, foo.com
@@ -87,9 +77,15 @@
return ['test_foo', 'test_bar']
def listnames(self):
return ['package', 'foo', 'bar.py']
+
+ class Container(object):
+ def __init__(self, **args):
+ for arg, val in args.items():
+ setattr(self, arg, val)
+
parent = Container(parent=None, fspath=py.path.local('.'))
- event = Container(item=FakeModule(parent))
- reporter.report_ItemStart(event)
+ event = report.ItemStart(item=FakeModule(parent))
+ reporter.report(event)
assert stdout.getvalue() == """\
Testing module foo/bar.py (2 items)
-----------------------------------
@@ -108,32 +104,58 @@
"""
def test_ReceivedItemOutcome_PASSED(self):
- outcome = Container(passed=True, excinfo=False)
+ outcome = Outcome()
+ class Container(object):
+ def __init__(self, **args):
+ for arg, val in args.items():
+ setattr(self, arg, val)
+
item = Container(listnames=lambda: ['', 'foo.py', 'bar', '()', 'baz'])
- event = Container(channel=ch, outcome=outcome, item=item)
- reporter.report_ReceivedItemOutcome(event)
+ event = report.ReceivedItemOutcome(channel=ch, outcome=outcome, item=item)
+ reporter.report(event)
assert stdout.getvalue() == ('* localhost\\: **PASSED** '
'foo.py/bar()/baz\n\n')
def test_ReceivedItemOutcome_SKIPPED(self):
- outcome = Container(passed=False, skipped=True, excinfo=False)
+ class Container(object):
+ def __init__(self, **args):
+ for arg, val in args.items():
+ setattr(self, arg, val)
+
+ outcome = Outcome(skipped="reason")
item = Container(listnames=lambda: ['', 'foo.py', 'bar', '()', 'baz'])
- event = Container(channel=ch, outcome=outcome, item=item)
- reporter.report_ReceivedItemOutcome(event)
+ event = report.ReceivedItemOutcome(channel=ch, outcome=outcome, item=item)
+ reporter.report(event)
assert stdout.getvalue() == ('* localhost\\: **SKIPPED** '
'foo.py/bar()/baz\n\n')
def test_ReceivedItemOutcome_FAILED(self):
- outcome = Container(passed=False, skipped=False)
+ class Container(object):
+ def __init__(self, **args):
+ for arg, val in args.items():
+ setattr(self, arg, val)
+
+ outcome = Outcome(excinfo="xxx")
item = Container(listnames=lambda: ['', 'foo.py', 'bar', '()', 'baz'])
- event = Container(channel=ch, outcome=outcome, item=item)
- reporter.report_ReceivedItemOutcome(event)
+ event = report.ReceivedItemOutcome(channel=ch, outcome=outcome, item=item)
+ reporter.report(event)
assert stdout.getvalue() == """\
* localhost\: **FAILED** `traceback0`_ foo.py/bar()/baz
"""
def test_skips(self):
+ class Container(object):
+ def __init__(self, **args):
+ for arg, val in args.items():
+ setattr(self, arg, val)
+
+ class FakeOutcome(Container, report.ReceivedItemOutcome):
+ pass
+
+ class FakeTryiter(Container, report.SkippedTryiter):
+ pass
+
reporter.skips()
assert stdout.getvalue() == ''
reporter.skipped_tests_outcome = [
@@ -153,6 +175,15 @@
"""
def test_failures(self):
+ py.test.skip("This one is totally artificial, needs to be rewritten")
+ class Container(object):
+ def __init__(self, **args):
+ for arg, val in args.items():
+ setattr(self, arg, val)
+
+ class FakeOutcome(Container, report.ReceivedItemOutcome):
+ pass
+
parent = Container(parent=None, fspath=py.path.local('.'))
reporter.failed_tests_outcome = [
FakeOutcome(
More information about the pytest-commit
mailing list