diff options
| author | Jurko Gospodnetić <jurko.gospodnetic@pke.hr> | 2014-01-18 12:31:33 +0100 |
|---|---|---|
| committer | Jurko Gospodnetić <jurko.gospodnetic@pke.hr> | 2014-01-18 12:31:33 +0100 |
| commit | 9fb2079458d39921913d3c8975f1ccc9ad914d88 (patch) | |
| tree | 7f5284ec6c5856c5a3fb46708cfbed3d523641a2 /testing/test_nose.py | |
| parent | 83620ced2e847c0de721b0e78092bcd0677c9c4e (diff) | |
| download | pytest-9fb2079458d39921913d3c8975f1ccc9ad914d88.tar.gz | |
replace py.test module references with pytest
The only remaining 'py.test' references are:
* those referring to the 'py.test' executable
* those in code explicitly testing py.test/pytest module compatibility
* those in old CHANGES documentation
* those in documentation generated based on external data
* those in seemingly unfinished & unmaintained Japanese documentation
Minor stylistic changes and typo corrections made to documentation next to
several applied py.test --> pytest content changes.
Diffstat (limited to 'testing/test_nose.py')
| -rw-r--r-- | testing/test_nose.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/test_nose.py b/testing/test_nose.py index 72a763675..692759bc0 100644 --- a/testing/test_nose.py +++ b/testing/test_nose.py @@ -1,7 +1,7 @@ import py, pytest def setup_module(mod): - mod.nose = py.test.importorskip("nose") + mod.nose = pytest.importorskip("nose") def test_nose_setup(testdir): p = testdir.makepyfile(""" @@ -112,7 +112,7 @@ def test_nose_setup_func_failure_2(testdir): reprec.assertoutcome(passed=1) def test_nose_setup_partial(testdir): - py.test.importorskip("functools") + pytest.importorskip("functools") p = testdir.makepyfile(""" from functools import partial |