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

lineparser/utilcmds test cleanup

Browse Source 
* fix date in copyright
* remove redundant class docstrings
* don't rename utilcmds module in unit test
* use `mode_manager` fixture in place of FakeModeMan
* some whitespace
This commit is contained in:
Daniel Karbach 2016-10-27 13:52:42 +02:00
parent e1c467b3a0
commit 64cf8fcd39
3 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/end2end/features/test_utilcmds_bdd.py
View File

@ -1,6 +1,6 @@
# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
# Copyright 2015-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
# Copyright 2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
#
# This file is part of qutebrowser.
#

6
tests/unit/misc/test_lineparser.py
View File

@ -28,8 +28,6 @@ from qutebrowser.misc import lineparser as lineparsermod
class TestBaseLineParser:
"""Tests for BaseLineParser."""
CONFDIR = "this really doesn't matter"
FILENAME = "and neither does this"
@ -95,8 +93,6 @@ class TestBaseLineParser:
class TestLineParser:
"""Tests for LineParser."""
@pytest.fixture
def lineparser(self, tmpdir):
"""Fixture to get a LineParser for tests."""
@ -140,8 +136,6 @@ class TestLineParser:
class TestAppendLineParser:
"""Tests for AppendLineParser."""
BASE_DATA = ['old data 1', 'old data 2']
@pytest.fixture

39
tests/unit/misc/test_utilcmds.py
View File

@ -1,6 +1,6 @@
# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
# Copyright 2015-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
# Copyright 2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
#
# This file is part of qutebrowser.
#
@ -33,7 +33,7 @@ try:
except ImportError:
pass
from qutebrowser.misc import utilcmds as utilcmdsmod
from qutebrowser.misc import utilcmds
from qutebrowser.commands import cmdexc
@ -49,7 +49,8 @@ def _trapped_segv(handler):
def test_debug_crash_exception():
"""Verify that debug_crash crashes as intended."""
with pytest.raises(Exception):
utilcmdsmod.debug_crash(typ='exception')
utilcmds.debug_crash(typ='exception')
@pytest.mark.skipif(os.name == 'nt',
reason="current CPython/win can't recover from SIGSEGV")
@ -66,7 +67,7 @@ def test_debug_crash_segfault():
# since we handle the segfault, execution will continue and run into
# the "Segfault failed (wat.)" Exception
with pytest.raises(Exception) as excinfo:
utilcmdsmod.debug_crash(typ='segfault')
utilcmds.debug_crash(typ='segfault')
time.sleep(0.001)
assert caught
assert 'Segfault failed' in str(excinfo.value)
@ -76,43 +77,31 @@ def test_debug_crash_segfault():
def test_debug_trace(mocker):
"""Check if hunter.trace is properly called."""
hunter_mock = mocker.patch('qutebrowser.misc.utilcmds.hunter')
utilcmdsmod.debug_trace(1)
utilcmds.debug_trace(1)
assert hunter_mock.trace.assert_called_with(1)
hunter_mock.trace.side_effect = Exception
with pytest.raises(Exception):
utilcmdsmod.debug_trace()
utilcmds.debug_trace()
def test_debug_trace_no_hunter(monkeypatch):
"""Test that an error is shown if debug_trace is called without hunter."""
monkeypatch.setattr(utilcmdsmod, 'hunter', None)
monkeypatch.setattr(utilcmds, 'hunter', None)
with pytest.raises(cmdexc.CommandError):
utilcmdsmod.debug_trace()
utilcmds.debug_trace()
class FakeModeMan:
"""ModeManager mock class for :repeat-command test.
Attributes:
mode: False
"""
def __init__(self):
self.mode = False
def test_repeat_command_initial(mocker):
def test_repeat_command_initial(mocker, mode_manager):
"""Test repeat_command first-time behavior.
If :repeat-command is called initially, it should err, because there's
nothing to repeat.
"""
objreg_mock = mocker.patch('qutebrowser.misc.utilcmds.objreg')
objreg_mock.get.return_value = FakeModeMan()
objreg_mock.get.return_value = mode_manager
with pytest.raises(cmdexc.CommandError):
utilcmdsmod.repeat_command(win_id=0)
utilcmds.repeat_command(win_id=0)
def test_debug_log_level(mocker):
@ -121,7 +110,7 @@ def test_debug_log_level(mocker):
'qutebrowser.misc.utilcmds.log.change_console_formatter')
handler_mock = mocker.patch(
'qutebrowser.misc.utilcmds.log.console_handler')
utilcmdsmod.debug_log_level(level='debug')
utilcmds.debug_log_level(level='debug')
formatter_mock.assert_called_with(logging.DEBUG)
handler_mock.setLevel.assert_called_with(logging.DEBUG)
@ -146,7 +135,7 @@ def test_window_only(mocker, monkeypatch):
winreg_mock.window_registry = test_windows
sip_mock = mocker.patch('qutebrowser.misc.utilcmds.sip')
sip_mock.isdeleted.side_effect = lambda window: window.deleted
utilcmdsmod.window_only(current_win_id=0)
utilcmds.window_only(current_win_id=0)
assert not test_windows[0].closed
assert not test_windows[1].closed
assert test_windows[2].closed