x/tobiko
Code Issues Proposed changes

Merge "Revert "Get required fixture even from owner object type""

Browse Source
This commit is contained in:
Zuul 2021-09-14 17:18:47 +00:00 committed by Gerrit Code Review
commit af377b71ac
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tobiko/common/_fixture.py
View File

@ -484,7 +484,10 @@ class RequiredFixtureProperty(object):
self.setup = setup self.setup = setup
def __get__(self, instance, _): 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): def get_fixture(self, _instance):
fixture = get_fixture(self.fixture, **self.fixture_params) fixture = get_fixture(self.fixture, **self.fixture_params)

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

@ -388,12 +388,6 @@ class RequiredFixtureTest(unit.TobikoUnitTest):
fixture.setup_fixture.assert_not_called() fixture.setup_fixture.assert_not_called()
fixture.cleanup_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): class SharedFixtureTest(unit.TobikoUnitTest):