From 55838a126db4fb75dfa23f6db8dab5fed3c94931 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 5 Aug 2020 19:24:53 -0300 Subject: [PATCH] Remove unnecessary skipif and changelog --- changelog/566.bugfix | 1 - testing/acceptance_test.py | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 changelog/566.bugfix diff --git a/changelog/566.bugfix b/changelog/566.bugfix deleted file mode 100644 index e0be4ae..0000000 --- a/changelog/566.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix test_config_initialization not being skipped correctly on pytest-4 diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index c21e079..5b19ee6 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -1,8 +1,6 @@ import os import re -import sys import textwrap -from pkg_resources import parse_version import py import pytest @@ -578,10 +576,6 @@ def test_fixture_teardown_failure(testdir): assert result.ret -@pytest.mark.skipif( - parse_version(pytest.__version__) < parse_version("5"), - reason="Only available in pytest 5.0+", -) def test_config_initialization(testdir, monkeypatch, pytestconfig): """Ensure workers and master are initialized consistently. Integration test for #445""" testdir.makepyfile(