rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove default_config fixture

Browse Source
This commit is contained in:
Florian Bruhin 2017-09-15 14:13:27 +02:00
parent 9f955f251a
commit 54dfc083f9
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/helpers/fixtures.py
View File

@ -228,13 +228,6 @@ def config_stub(stubs, monkeypatch, configdata_init):
return conf return conf
@pytest.fixture
def default_config():
"""Fixture that provides and registers an empty default config object."""
# FIXME:conf
return None
@pytest.fixture @pytest.fixture
def key_config_stub(config_stub, monkeypatch): def key_config_stub(config_stub, monkeypatch):
"""Fixture which provides a fake key config object.""" """Fixture which provides a fake key config object."""

11
tests/unit/browser/test_tab.py
View File

@ -49,7 +49,7 @@ def view(qtbot, config_stub, request):
@pytest.fixture(params=['webkit', 'webengine']) @pytest.fixture(params=['webkit', 'webengine'])
def tab(request, default_config, qtbot, tab_registry, cookiejar_and_cache): def tab(request, qtbot, tab_registry, cookiejar_and_cache, mode_manager):
if PYQT_VERSION < 0x050600: if PYQT_VERSION < 0x050600:
pytest.skip('Causes segfaults, see #1638') pytest.skip('Causes segfaults, see #1638')
@ -63,17 +63,10 @@ def tab(request, default_config, qtbot, tab_registry, cookiejar_and_cache):
else: else:
assert False assert False
# Can't use the mode_manager fixture as that uses config_stub, which t = tab_class(win_id=0, mode_manager=mode_manager)
# conflicts with default_config
mm = modeman.ModeManager(0)
objreg.register('mode-manager', mm, scope='window', window=0)
t = tab_class(win_id=0, mode_manager=mm)
qtbot.add_widget(t) qtbot.add_widget(t)
yield t yield t
objreg.delete('mode-manager', scope='window', window=0)
class Zoom(browsertab.AbstractZoom): class Zoom(browsertab.AbstractZoom):