x/tobiko
Code Issues Proposed changes

Use mock library to verify setUp and cleanUp are called

Browse Source 
Change-Id: I8731e3e676eeb8099dea9b13f524e72292911d7b
This commit is contained in:
Federico Ressi 2019-03-04 09:22:36 +01:00
parent 903e85083d
commit 0d7fe979c2
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tobiko/common/managers/fixture.py
View File

@ -162,11 +162,11 @@ class FixtureManager(object):
def get_fixture(self, obj, init=init_fixture): def get_fixture(self, obj, init=init_fixture):
name = get_object_name(obj) name = get_object_name(obj)
_fixture = self.fixtures.get(name) fixture = self.fixtures.get(name)
if _fixture is None: if fixture is None:
self.fixtures[name] = _fixture = init(name=name, obj=obj) self.fixtures[name] = fixture = init(name=name, obj=obj)
assert isinstance(_fixture, fixtures.Fixture) assert isinstance(fixture, fixtures.Fixture)
return _fixture return fixture
FIXTURES = FixtureManager() FIXTURES = FixtureManager()

31
tobiko/tests/test_fixture.py
View File

@ -14,19 +14,14 @@
from __future__ import absolute_import from __future__ import absolute_import
import fixtures import fixtures
import mock
import tobiko import tobiko
from tobiko.tests import base from tobiko.tests import base
class MyFixtureClass(fixtures.Fixture): class MyFixtureClass(fixtures.Fixture):
pass
def _setUp(self):
self.setup_executed = True
self.addCleanup(self._cleanUp)
def _cleanUp(self):
self.cleanup_executed = True
MY_FIXTURE_NAME = __name__ + '.' + MyFixtureClass.__name__ MY_FIXTURE_NAME = __name__ + '.' + MyFixtureClass.__name__
@ -58,11 +53,11 @@ class FixtureTypeTest(base.TobikoTest):
def _test_setup_fixture(self, obj): def _test_setup_fixture(self, obj):
fixture = tobiko.get_fixture(obj) fixture = tobiko.get_fixture(obj)
fixture.setup_executed = False fixture.setUp = setup = mock.MagicMock()
tobiko.setup_fixture(obj) tobiko.setup_fixture(obj)
self.assertTrue(fixture.setup_executed) setup.assert_called_once_with()
def test_cleanup_fixture_by_name(self): def test_cleanup_fixture_by_name(self):
self._test_cleanup_fixture(MY_FIXTURE_NAME) self._test_cleanup_fixture(MY_FIXTURE_NAME)
@ -71,12 +66,14 @@ class FixtureTypeTest(base.TobikoTest):
self._test_cleanup_fixture(MyFixtureClass) self._test_cleanup_fixture(MyFixtureClass)
def _test_cleanup_fixture(self, obj): def _test_cleanup_fixture(self, obj):
cleanup = mock.MagicMock()
fixture = tobiko.get_fixture(obj) fixture = tobiko.get_fixture(obj)
fixture.setUp() fixture.setUp()
fixture.addCleanup(cleanup)
tobiko.cleanup_fixture(obj) tobiko.cleanup_fixture(obj)
self.assertTrue(fixture.cleanup_executed) cleanup.assert_called_once_with()
def test_list_required_fixtures_from_module(self): def test_list_required_fixtures_from_module(self):
result = tobiko.list_required_fixtures([__name__]) result = tobiko.list_required_fixtures([__name__])
@ -108,14 +105,18 @@ class FixtureTypeTest(base.TobikoTest):
def test_setup_required_fixtures(self, fixture_type=MyFixtureClass): def test_setup_required_fixtures(self, fixture_type=MyFixtureClass):
fixture = tobiko.get_fixture(fixture_type) fixture = tobiko.get_fixture(fixture_type)
fixture.setup_executed = False fixture.setUp = setup = mock.MagicMock()
tobiko.setup_required_fixtures([self.id()]) tobiko.setup_required_fixtures([self.id()])
self.assertTrue(fixture.setup_executed)
setup.assert_called_once_with()
def test_cleanup_required_fixtures(self, fixture_type=MyFixtureClass): def test_cleanup_required_fixtures(self, fixture_type=MyFixtureClass):
cleanup = mock.MagicMock()
fixture = tobiko.get_fixture(fixture_type) fixture = tobiko.get_fixture(fixture_type)
fixture.cleanup_executed = False
fixture.setUp() fixture.setUp()
fixture.addCleanup(cleanup)
tobiko.cleanup_required_fixtures([self.id()]) tobiko.cleanup_required_fixtures([self.id()])
self.assertTrue(fixture.setup_executed)
self.assertTrue(fixture.cleanup_executed) cleanup.assert_called_once_with()