This commit is contained in:
Florian Bruhin 2018-02-20 11:43:41 +01:00
parent b9bb515b3b
commit ae73215724
3 changed files with 3 additions and 4 deletions

View File

@ -26,8 +26,7 @@ import pytest
from PyQt5.QtCore import QObject, QUrl from PyQt5.QtCore import QObject, QUrl
from PyQt5.QtGui import QColor from PyQt5.QtGui import QColor
from qutebrowser.config import (config, configdata, configexc, configfiles, from qutebrowser.config import config, configdata, configexc, configutils
configutils)
from qutebrowser.utils import usertypes, urlmatch from qutebrowser.utils import usertypes, urlmatch
from qutebrowser.misc import objects from qutebrowser.misc import objects
@ -417,7 +416,6 @@ class TestConfig:
conf.set_obj(name, False, pattern=pattern) conf.set_obj(name, False, pattern=pattern)
assert conf.get(name, url=QUrl('https://example.com/')) is True assert conf.get(name, url=QUrl('https://example.com/')) is True
@pytest.mark.parametrize('value', [{}, {'normal': {'a': 'nop'}}]) @pytest.mark.parametrize('value', [{}, {'normal': {'a': 'nop'}}])
def test_get_bindings(self, config_stub, conf, value): def test_get_bindings(self, config_stub, conf, value):
"""Test conf.get() with bindings which have missing keys.""" """Test conf.get() with bindings which have missing keys."""

View File

@ -27,7 +27,7 @@ import pytest
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from qutebrowser.config import (config, configfiles, configexc, configdata, from qutebrowser.config import (config, configfiles, configexc, configdata,
configtypes, configutils) configtypes)
from qutebrowser.utils import utils, usertypes from qutebrowser.utils import utils, usertypes

View File

@ -40,6 +40,7 @@ def opt():
default='default value', backends=None, default='default value', backends=None,
raw_backends=None, description=None) raw_backends=None, description=None)
@pytest.fixture @pytest.fixture
def pattern(): def pattern():
return urlmatch.UrlPattern('*://www.example.com/') return urlmatch.UrlPattern('*://www.example.com/')