x
/
tobiko
Code Issues Proposed changes

Merge "Get required fixture even from owner object type"

This commit is contained in:
Zuul 2021-09-02 09:41:47 +00:00 committed by Gerrit Code Review
parent dd9d78027b b77b89a914
commit 302e04edc8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tobiko/common/_fixture.py
View File

@ -484,10 +484,7 @@ class RequiredFixtureProperty(object):
self.setup = setup
def __get__(self, instance, _):
if instance is None:
return self
else:
return self.get_fixture(instance)
return self.get_fixture(instance)
def get_fixture(self, _instance):
fixture = get_fixture(self.fixture, **self.fixture_params)

6
tobiko/tests/unit/test_fixture.py
View File

@ -388,6 +388,12 @@ 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):