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

Fix tests without DISPLAY.

Browse Source
This commit is contained in:
Florian Bruhin 2015-09-28 21:50:55 +02:00
parent 1861b0a5e4
commit 4854ca42fd
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/browser/test_cookies.py
View File

@ -128,7 +128,7 @@ def test_purge_old_cookies(config_stub, fake_save_manager):
assert raw_cookies == [COOKIE1, COOKIE2, SESSION_COOKIE] assert raw_cookies == [COOKIE1, COOKIE2, SESSION_COOKIE]
def test_save(config_stub, fake_save_manager, monkeypatch): def test_save(config_stub, fake_save_manager, monkeypatch, qapp):
"""Test that expired and session cookies are not saved.""" """Test that expired and session cookies are not saved."""
monkeypatch.setattr(lineparser, monkeypatch.setattr(lineparser,
'LineParser', LineparserSaveStub) 'LineParser', LineparserSaveStub)
@ -156,7 +156,7 @@ def test_cookies_changed_emit(config_stub, fake_save_manager,
def test_cookies_changed_not_emitted(config_stub, fake_save_manager, def test_cookies_changed_not_emitted(config_stub, fake_save_manager,
monkeypatch): monkeypatch, qapp):
"""Test that changed is not emitted when nothing changes.""" """Test that changed is not emitted when nothing changes."""
config_stub.data = CONFIG_COOKIES_ENABLED config_stub.data = CONFIG_COOKIES_ENABLED
monkeypatch.setattr(lineparser, monkeypatch.setattr(lineparser,

7
tests/unit/config/test_configtypes_hypothesis.py
View File

@ -18,6 +18,8 @@
"""Hypothesis tests for qutebrowser.config.configtypes.""" """Hypothesis tests for qutebrowser.config.configtypes."""
import os
import sys
import inspect import inspect
import functools import functools
@ -44,6 +46,11 @@ def gen_classes():
@hypothesis.given(strategies.text()) @hypothesis.given(strategies.text())
@hypothesis.example('\x00') @hypothesis.example('\x00')
def test_configtypes_hypothesis(klass, s): def test_configtypes_hypothesis(klass, s):
if (klass in [configtypes.File, configtypes.UserStyleSheet] and
sys.platform == 'linux' and
not os.environ.get('DISPLAY', '')):
pytest.skip("No DISPLAY available")
try: try:
klass().validate(s) klass().validate(s)
except configexc.ValidationError: except configexc.ValidationError:

3
tests/unit/misc/test_ipc.py
View File

@ -45,6 +45,9 @@ from helpers import stubs # pylint: disable=import-error
Args = collections.namedtuple('Args', 'basedir') Args = collections.namedtuple('Args', 'basedir')
pytestmark = pytest.mark.usefixtures('qapp')
@pytest.yield_fixture() @pytest.yield_fixture()
def short_tmpdir(): def short_tmpdir():
with tempfile.TemporaryDirectory() as tdir: with tempfile.TemporaryDirectory() as tdir: