From daec4c70b85bd277ff9f1422034d977682e9ade0 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sat, 7 Dec 2013 19:31:27 +0100 Subject: [PATCH] refactor sorting wrt class-scopes. This fixes issue396 and also simplifies the internal sorting algorithm a bit. --- CHANGELOG | 4 ++++ testing/python/metafunc.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index cb1e23731..5487b5b91 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,10 @@ Unreleased hook and expecting certain fixture instances are torn down within (very unlikely and would have been unreliable anyway). +- fix issue290 - there is preliminary support now for parametrizing + with repeated same values (sometimes useful to to test if calling + a second time works as with the first time). + - fix issue246 (again) fix finalizer order to be LIFO on independent fixtures depending on a parametrized higher-than-function scoped fixture. (fix quite some effort so please bear with the complexity of this sentence :) diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py index 0a04b82e9..b0804220d 100644 --- a/testing/python/metafunc.py +++ b/testing/python/metafunc.py @@ -814,7 +814,7 @@ class TestMarkersWithParametrization: reprec.assertoutcome(passed=2, skipped=2) - @pytest.mark.xfail(reason="issue 290") + @pytest.mark.issue290 def test_parametrize_ID_generation_string_int_works(self, testdir): testdir.makepyfile(""" import pytest