Rename klass fixture to klass_fixt.

See https://github.com/pytest-dev/pytest/issues/979.
This commit is contained in:
Florian Bruhin 2015-08-31 07:42:53 +02:00
parent 9e6bcb97ca
commit 03f4d738ab

View File

@ -819,7 +819,12 @@ class TestColors:
TESTS = ColorTests() TESTS = ColorTests()
@pytest.fixture(params=ColorTests.TYPES) @pytest.fixture(params=ColorTests.TYPES)
def klass(self, request): def klass_fixt(self, request):
"""Fixture which provides all ColorTests classes.
Named klass_fix so it has a different name from the parametrized klass,
see https://github.com/pytest-dev/pytest/issues/979.
"""
return request.param return request.param
def test_test_generator(self): def test_test_generator(self):
@ -836,9 +841,9 @@ class TestColors:
with pytest.raises(configexc.ValidationError): with pytest.raises(configexc.ValidationError):
klass().validate(val) klass().validate(val)
def test_validate_invalid_empty(self, klass): def test_validate_invalid_empty(self, klass_fixt):
with pytest.raises(configexc.ValidationError): with pytest.raises(configexc.ValidationError):
klass().validate('') klass_fixt().validate('')
@pytest.mark.parametrize('klass, val', TESTS.valid) @pytest.mark.parametrize('klass, val', TESTS.valid)
def test_transform(self, klass, val): def test_transform(self, klass, val):