diff --git a/tobiko/common/_fixture.py b/tobiko/common/_fixture.py index f061c371d..ccc76e757 100644 --- a/tobiko/common/_fixture.py +++ b/tobiko/common/_fixture.py @@ -484,7 +484,10 @@ class RequiredFixtureProperty(object): self.setup = setup def __get__(self, instance, _): - return self.get_fixture(instance) + if instance is None: + return self + else: + return self.get_fixture(instance) def get_fixture(self, _instance): fixture = get_fixture(self.fixture, **self.fixture_params) diff --git a/tobiko/tests/unit/test_fixture.py b/tobiko/tests/unit/test_fixture.py index 9159dc3ef..87c942145 100644 --- a/tobiko/tests/unit/test_fixture.py +++ b/tobiko/tests/unit/test_fixture.py @@ -388,12 +388,6 @@ class RequiredFixtureTest(unit.TobikoUnitTest): fixture.setup_fixture.assert_not_called() fixture.cleanup_fixture.assert_not_called() - def test_required_fixture_with_type(self): - fixture = type(self).required_fixture - self.assertIsInstance(fixture, MyRequiredFixture) - fixture.setup_fixture.assert_called() - fixture.cleanup_fixture.assert_not_called() - class SharedFixtureTest(unit.TobikoUnitTest):