summaryrefslogtreecommitdiff
path: root/testing/test_nose.py
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-04-16 09:04:05 +0200
committerholger krekel <holger@merlinux.eu>2013-04-16 09:04:05 +0200
commitbb6f3ebd3111fb40ce678ad95fd940b580c97b77 (patch)
treec4da7c9844fb3c3d483380f9fdd8da0b2f0f903d /testing/test_nose.py
parent94aa76fec0259c456e7a4dc547b5f5751092aba2 (diff)
downloadpytest-bb6f3ebd3111fb40ce678ad95fd940b580c97b77.tar.gz
slightly improve -k help string
cosmetic change to test_nose.py
Diffstat (limited to 'testing/test_nose.py')
-rw-r--r--testing/test_nose.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/testing/test_nose.py b/testing/test_nose.py
index cdebca8dd..3ecfa9c07 100644
--- a/testing/test_nose.py
+++ b/testing/test_nose.py
@@ -304,8 +304,9 @@ def test_apiwrapper_problem_issue260(testdir):
result = testdir.runpytest()
result.stdout.fnmatch_lines("*1 passed*")
+@pytest.mark.skipif("sys.version_info < (2,6)")
def test_setup_teardown_linking_issue265(testdir):
- # we accidnetially didnt integrate nose setupstate with normal setupstate
+ # we accidentally didnt integrate nose setupstate with normal setupstate
# this test ensures that won't happen again
testdir.makepyfile('''
import pytest
@@ -314,7 +315,8 @@ def test_setup_teardown_linking_issue265(testdir):
def test_nothing(self):
"""Tests the API of the implementation (for generic and specialized)."""
- @pytest.mark.skipif("True", reason="Skip tests to check if teardown is skipped as well.")
+ @pytest.mark.skipif("True", reason=
+ "Skip tests to check if teardown is skipped as well.")
class TestSkipTeardown(TestGeneric):
def setup(self):