From d3215c10b6f9ccd8940f9345642ee0718f158585 Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Sat, 27 Oct 2018 11:25:51 +0100 Subject: Mark Py 2/3-only tests as skip instead of xfail Also reuse pre-defined py2_only and py3_only decorators where appropriate. --- setuptools/tests/test_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setuptools/tests/test_test.py') diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py index 960527bc..4ba70484 100644 --- a/setuptools/tests/test_test.py +++ b/setuptools/tests/test_test.py @@ -93,7 +93,7 @@ def test_test(capfd): assert out == 'Foo\n' -@pytest.mark.xfail( +@pytest.mark.skipif( sys.version_info < (2, 7), reason="No discover support for unittest on Python 2.6", ) -- cgit v1.2.1 From 98056a680fde6bede9ce4c159b72d1ac01bf9067 Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Sat, 27 Oct 2018 11:39:30 +0100 Subject: Remove pytest marker and code for Python < 2.7 --- setuptools/tests/test_test.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'setuptools/tests/test_test.py') diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py index 4ba70484..8d1425e1 100644 --- a/setuptools/tests/test_test.py +++ b/setuptools/tests/test_test.py @@ -93,10 +93,6 @@ def test_test(capfd): assert out == 'Foo\n' -@pytest.mark.skipif( - sys.version_info < (2, 7), - reason="No discover support for unittest on Python 2.6", -) @pytest.mark.usefixtures('tmpdir_cwd', 'quiet_log') def test_tests_are_run_once(capfd): params = dict( -- cgit v1.2.1 From 5cd86987530892bfb01f68ad5f1a2b997a3d01e7 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 26 Jan 2019 20:20:12 -0500 Subject: Feed the hobgoblins (delint). --- setuptools/tests/test_test.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setuptools/tests/test_test.py') diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py index 8d1425e1..faaa6ba9 100644 --- a/setuptools/tests/test_test.py +++ b/setuptools/tests/test_test.py @@ -4,7 +4,6 @@ from __future__ import unicode_literals from distutils import log import os -import sys import pytest -- cgit v1.2.1