diff options
| author | holger krekel <holger@merlinux.eu> | 2010-11-17 22:12:16 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2010-11-17 22:12:16 +0100 |
| commit | a698465487a9cd92e8223d7f9be0e7710272f8ca (patch) | |
| tree | ca2c9641dec4e2343dd4206d4c713bc196fa1dc3 /testing/test_collection.py | |
| parent | 93a436542c69ea27cd1799266bb49f3f6d4fe7a2 (diff) | |
| download | pytest-a698465487a9cd92e8223d7f9be0e7710272f8ca.tar.gz | |
streamline docs, especially use "import pytest" and "pytest.*" in python code examples instead of "import py" and "py.test.*".
Diffstat (limited to 'testing/test_collection.py')
| -rw-r--r-- | testing/test_collection.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/test_collection.py b/testing/test_collection.py index e26925bef..425edd887 100644 --- a/testing/test_collection.py +++ b/testing/test_collection.py @@ -178,7 +178,7 @@ class TestPrunetraceback: "*hello world*", ]) - @py.test.mark.xfail(reason="other mechanism for adding to reporting needed") + @pytest.mark.xfail(reason="other mechanism for adding to reporting needed") def test_collect_report_postprocessing(self, testdir): p = testdir.makepyfile(""" import not_exists @@ -520,7 +520,7 @@ class Test_genitems: # do we want to unify behaviour with # test_subdir_conftest_error? p = testdir.makepyfile(conftest="raise SyntaxError\n") - py.test.raises(SyntaxError, testdir.inline_genitems, p.dirpath()) + pytest.raises(SyntaxError, testdir.inline_genitems, p.dirpath()) def test_example_items1(self, testdir): p = testdir.makepyfile(''' |