Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix get_engine options agreement #303

Merged
merged 2 commits into from
Mar 9, 2016
Merged

Fix get_engine options agreement #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1aa0ae
OffScreenEngine should be excluded for backend=auto and offscreen=False
kitchoi Feb 29, 2016
86d30fd
more robust test for engine_manager.get_engine
kitchoi Feb 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions mayavi/tests/test_engine_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,37 +32,49 @@ def test_get_engine_backend_test(self):
@patch_backend("envisage")
@patch_registry_engines({"EnvisageEngine1": EnvisageEngine()})
def test_get_engine_backend_envisage(self):
self.assertIsInstance(get_engine(), EnvisageEngine)
self.assertIs(type(get_engine()), EnvisageEngine)

@patch_backend("simple")
@patch_registry_engines({"Engine1": NullEngine()})
def test_get_engine_backend_simple_with_existing_engine(self):
self.assertIsInstance(get_engine(), Engine)
self.assertIs(type(get_engine()), Engine)

@patch_backend("auto")
@patch_registry_engines({"Engine1": EnvisageEngine()})
def test_get_engine_backend_auto_with_existing_engine(self):
self.assertIsInstance(get_engine(), EnvisageEngine)
self.assertIs(type(get_engine()), EnvisageEngine)

@patch_backend("envisage")
@patch_registry_engines({"EnvisageEngine1": EnvisageEngine()})
@patch_offscreen(True)
def test_get_engine_offscreen_backend_envisage(self):
self.assertIsInstance(get_engine(), EnvisageEngine)
self.assertIs(type(get_engine()), EnvisageEngine)

@patch_backend("test")
@patch_offscreen(True)
def test_get_engine_offscreen_backend_test(self):
self.assertIsInstance(get_engine(), NullEngine)
self.assertIs(type(get_engine()), NullEngine)

@patch_backend("auto")
@patch_offscreen(True)
@patch_registry_engines({"Engine1": Engine()})
def test_get_engine_offscreen_backend_auto_with_existing_engine(self):
self.assertIsInstance(get_engine(), OffScreenEngine)
self.assertIs(type(get_engine()), OffScreenEngine)

@patch_backend("auto")
@patch_offscreen(True)
@patch_registry_engines({"Engine1": Engine()})
def test_get_engine_offscreen_backend_auto_switched_twice(self):
self.assertIs(type(get_engine()), OffScreenEngine)
# Now OffScreenEngine is the last used engine
# if offscreen is switched back to False
# get_engine should not return an OffScreenEngine
from mayavi.tools.engine_manager import options
options.offscreen = False
self.assertIs(type(get_engine()), Engine)

@patch_backend("simple")
@patch_offscreen(True)
@patch_registry_engines({"Engine1": Engine()})
def test_get_engine_offscreen_backend_simple_with_started_engine(self):
self.assertIsInstance(get_engine(), OffScreenEngine)
self.assertIs(type(get_engine()), OffScreenEngine)
3 changes: 2 additions & 1 deletion mayavi/tools/engine_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ def get_engine(self):
if e.__class__.__name__ == 'OffScreenEngine']
elif options.backend == 'auto':
suitable = [e for e in engines
if e.__class__.__name__ != 'NullEngine']
if e.__class__.__name__ not in ('NullEngine',
'OffScreenEngine')]
else:
suitable = [e for e in engines
if e.__class__.__name__ == 'Engine']
Expand Down