diff options
| author | holger krekel <holger@merlinux.eu> | 2010-09-26 16:23:44 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2010-09-26 16:23:44 +0200 |
| commit | 1c020c3d32ebf0cd008271462b6bbc12a77db2d9 (patch) | |
| tree | 76b4b0320ca375299a7c319f2d5c465b72ea69d5 /testing/test_collection.py | |
| parent | 7d1585215df4cb629b94c3f247dff5ef213b6251 (diff) | |
| download | pytest-1c020c3d32ebf0cd008271462b6bbc12a77db2d9.tar.gz | |
shift reporting info generation away from terminal reporting time, simplify code.
also get rid of redundant 'shortrepr' on collect/test reports
and rename reportinfo to "location" in some places
--HG--
branch : trunk
Diffstat (limited to 'testing/test_collection.py')
| -rw-r--r-- | testing/test_collection.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/testing/test_collection.py b/testing/test_collection.py index d80e7b19e..a346ad4e0 100644 --- a/testing/test_collection.py +++ b/testing/test_collection.py @@ -60,8 +60,8 @@ class TestCollection: ("pytest_collectstart", "collector.fspath == p"), ("pytest_make_collect_report", "collector.fspath == p"), ("pytest_pycollect_makeitem", "name == 'test_func'"), - ("pytest_collectreport", "report.collector.fspath == p"), - ("pytest_collectreport", "report.collector.fspath == topdir") + ("pytest_collectreport", "report.fspath == p"), + ("pytest_collectreport", "report.fspath == topdir") ]) def test_collect_protocol_method(self, testdir): @@ -115,9 +115,9 @@ class TestCollection: ("pytest_collectstart", "collector.__class__.__name__ == 'Module'"), ("pytest_pycollect_makeitem", "name == 'test_func'"), - ("pytest_collectreport", "report.collector.fspath == p"), + ("pytest_collectreport", "report.fspath == p"), ("pytest_collectreport", - "report.collector.fspath == report.collector.collection.topdir") + "report.fspath == %r" % str(rcol.topdir)), ]) def test_collect_subdir_event_ordering(self, testdir): @@ -135,8 +135,8 @@ class TestCollection: ("pytest_collectstart", "collector.fspath == aaa"), ("pytest_collectstart", "collector.fspath == test_aaa"), ("pytest_pycollect_makeitem", "name == 'test_func'"), - ("pytest_collectreport", "report.collector.fspath == test_aaa"), - ("pytest_collectreport", "report.collector.fspath == aaa"), + ("pytest_collectreport", "report.fspath == test_aaa"), + ("pytest_collectreport", "report.fspath == aaa"), ]) def test_collect_two_commandline_args(self, testdir): @@ -156,10 +156,10 @@ class TestCollection: hookrec.hookrecorder.contains([ ("pytest_collectstart", "collector.fspath == aaa"), ("pytest_pycollect_makeitem", "name == 'test_func'"), - ("pytest_collectreport", "report.collector.fspath == aaa"), + ("pytest_collectreport", "report.fspath == aaa"), ("pytest_collectstart", "collector.fspath == bbb"), ("pytest_pycollect_makeitem", "name == 'test_func'"), - ("pytest_collectreport", "report.collector.fspath == bbb"), + ("pytest_collectreport", "report.fspath == bbb"), ]) def test_serialization_byid(self, testdir): |